diff --git a/src/createRoom.js b/src/createRoom.js
index bf0c0fee1c..ce83f31c27 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -76,14 +76,11 @@ function createRoom(opts) {
         }
     ];
 
-    let modal;
-    setTimeout(()=>{
-        modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
-    }, 0);
+    const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
     let roomId;
     return client.createRoom(createOpts).finally(function() {
-        if (modal) modal.close();
+        modal.close();
     }).then(function(res) {
         roomId = res.room_id;
         if (opts.dmUserId) {