diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js
index 994c0385d..e81e49659 100644
--- a/openslides/core/static/js/core/base.js
+++ b/openslides/core/static/js/core/base.js
@@ -101,9 +101,10 @@ angular.module('OpenSlidesApp.core', [
                 _.forEach(Autoupdate.messageReceivers, function (receiver) {
                     receiver(event.data);
                 });
-                // The first message is done: resolve the promise.
-                // TODO: check whether the promise is already resolved.
-                Autoupdate.firstMessageDeferred.resolve();
+                // Check if the promise is not resolved yet.
+                if (Autoupdate.firstMessageDeferred.promise.$$state.status === 0) {
+                    Autoupdate.firstMessageDeferred.resolve();
+                }
             };
         };
         return Autoupdate;