diff --git a/src/connection/database/actions.js b/src/connection/database/actions.js
index 352788c27..8809ef954 100644
--- a/src/connection/database/actions.js
+++ b/src/connection/database/actions.js
@@ -75,11 +75,14 @@ export function signUp(id) {
       });
     }
 
-    webApi.signUp(id, params, (error, ...args) => {
+    webApi.signUp(id, params, (error, result, popupHandler, ...args) => {
       if (error) {
+        if (!!popupHandler) {
+          popupHandler._current_popup.kill();
+        }
         setTimeout(() => signUpError(id, error), 250);
       } else {
-        signUpSuccess(id, ...args);
+        signUpSuccess(id, result, popupHandler, ...args);
       }
     });
   });
diff --git a/src/core/web_api/legacy_api.js b/src/core/web_api/legacy_api.js
index 4e5904b40..4af33a5e0 100644
--- a/src/core/web_api/legacy_api.js
+++ b/src/core/web_api/legacy_api.js
@@ -73,7 +73,7 @@ class Auth0LegacyAPIClient {
 
     const popupHandler = (autoLogin && popup) ? this.client.popup.preload() : null;
 
-    this.client.signup(options, (err, result) => cb(err, result, popupHandler) );
+    this.client.signup(options, (err, result) => cb(err, result, popupHandler));
   }
 
   resetPassword(options, cb) {
diff --git a/src/core/web_api/p2_api.js b/src/core/web_api/p2_api.js
index 1867d110d..47fa068a7 100644
--- a/src/core/web_api/p2_api.js
+++ b/src/core/web_api/p2_api.js
@@ -65,9 +65,7 @@ class Auth0APIClient {
 
     delete options.autoLogin;
 
-    const popupHandler = (autoLogin && popup) ? this.client.popup.preload() : null;
-
-    this.client.signup(options, (err, result) => cb(err, result, popupHandler) );
+    this.client.signup(options, (err, result) => cb(err, result));
   }
 
   resetPassword(options, cb) {