diff --git a/packages/editor-ui/src/components/CredentialsInput.vue b/packages/editor-ui/src/components/CredentialsInput.vue
index 27a4597331..385f0ff9b5 100644
--- a/packages/editor-ui/src/components/CredentialsInput.vue
+++ b/packages/editor-ui/src/components/CredentialsInput.vue
@@ -404,10 +404,11 @@ export default mixins(
 						message: 'Connected successfully!',
 						type: 'success',
 					});
+
+					// Make sure that the event gets removed again
+					window.removeEventListener('message', receiveMessage, false);
 				}
 
-				// Make sure that the event gets removed again
-				window.removeEventListener('message', receiveMessage, false);
 			};
 
 			window.addEventListener('message', receiveMessage, false);