diff --git a/src/views/eventDetails.js b/src/views/eventDetails.js
index 4bb546f7f2703ccd4d6960771cffa65e9d31692e..d873f8e32aec764fa720feaf4653551378673aff 100644
--- a/src/views/eventDetails.js
+++ b/src/views/eventDetails.js
@@ -17,7 +17,9 @@ class EventSignupForm {
       return m('div');
     }
     if (isLoggedIn()) {
-      if (events.currentSignupHasLoaded() && typeof events.getCurrentSignup() === 'undefined') {
+      if (!events.currentSignupHasLoaded()) {
+        return m('span', 'Loading...');
+      } else if (typeof events.getCurrentSignup() === 'undefined') {
         return m('button', { onclick() { events.signupCurrent(); } }, 'signup');
       }
     } else if (events.getCurrent().allow_email_signup) {