diff --git a/react/features/app/components/AbstractApp.js b/react/features/app/components/AbstractApp.js
index 7e1a0c25e..6fbd2c3ef 100644
--- a/react/features/app/components/AbstractApp.js
+++ b/react/features/app/components/AbstractApp.js
@@ -307,7 +307,9 @@ export class AbstractApp extends Component {
             // non-reactified parts of the code (conference.js for example).
             // Don't use in the react code!!!
             // FIXME: remove when the reactification is finished!
-            APP.store = store;
+            if (typeof APP !== 'undefined') {
+                APP.store = store;
+            }
         }
 
         return store;
diff --git a/react/features/base/conference/middleware.js b/react/features/base/conference/middleware.js
index 728b8c34f..6aea2219f 100644
--- a/react/features/base/conference/middleware.js
+++ b/react/features/base/conference/middleware.js
@@ -56,7 +56,7 @@ function _connectionEstablished(store, next, action) {
 
     // FIXME: workaround for the web version. Currently the creation of the
     // conference is handled by /conference.js
-    if (!APP) {
+    if (typeof APP === 'undefined') {
         store.dispatch(createConference());
     }