diff --git a/src/api/forms/FormsAPI.js b/src/api/forms/FormsAPI.js
index a455500b9e..8f88c4253d 100644
--- a/src/api/forms/FormsAPI.js
+++ b/src/api/forms/FormsAPI.js
@@ -172,7 +172,9 @@ export default class FormsAPI {
 
         function onFormSave(save) {
             return () => {
-                overlay.dismiss();
+                if (overlay) {
+                    overlay.dismiss();
+                }
 
                 if (save) {
                     save(changes);