diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx
index 37253a0aeb..c7f540836a 100644
--- a/frontend/src/pages/SignUp/SignUp.tsx
+++ b/frontend/src/pages/SignUp/SignUp.tsx
@@ -82,17 +82,19 @@ const Signup = ({ version, userpref }: SignupProps): JSX.Element => {
 
 						history.push(ROUTES.APPLICATION);
 					} else {
+						setLoading(false);
+
 						notification.error({
 							message: 'Something went wrong',
 						});
 					}
 				} else {
+					setLoading(false);
+
 					notification.error({
 						message: 'Something went wrong',
 					});
 				}
-
-				setLoading(false);
 			} catch (error) {
 				notification.error({
 					message: 'Something went wrong',