diff --git a/client/src/views/record/edit.js b/client/src/views/record/edit.js
index 7d2881c456..bb108c0fc6 100644
--- a/client/src/views/record/edit.js
+++ b/client/src/views/record/edit.js
@@ -136,6 +136,8 @@ class EditRecordView extends DetailRecordView {
         }
 
         if (promise) {
+            this.wait(promise);
+
             // @todo Revise. Possible race condition issues.
             promise.then(() => super.setupBeforeFinal());
         }