diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index e642440bf0..e44f33a731 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -278,7 +278,7 @@ export function setLoggedIn(credentials) {
                 credentials.homeserverUrl);
 
     // Resolves by default
-    let teamPromise = q(null);
+    let teamPromise = Promise.resolve(null);
 
     // persist the session
     if (localStorage) {