diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1ca1992d75..c201d139c5 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -386,7 +386,7 @@ module.exports = React.createClass({
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
         // Start the onboarding process for certain actions
-        if (MatrixClientPeg.get().isGuest() &&
+        if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest() &&
             ONBOARDING_FLOW_STARTERS.includes(payload.action)
         ) {
             // This will cause `payload` to be dispatched later, once a