diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 0fdeb428826e1616884a8d3f62db8353a41e4e9a..0684071734eeab360e49d82dba33b4cdb9926e59 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -348,7 +348,7 @@ class UIRoot extends Component {
   }
 
   render() {
-    if (!this.state.sceneLoaded) {
+    if (!this.props.scene.hasLoaded) {
       return (
         <div>Loading scene</div>
       );
diff --git a/src/room.html b/src/room.html
index c6baedfd554d82a700d8dd430b0e085aef7468da..98f1aa2012b09b3af04bb202bcdaf0aa3652adb4 100644
--- a/src/room.html
+++ b/src/room.html
@@ -14,7 +14,6 @@
 </head>
 
 <body>
-    <div id="loader"></div>
     <audio id="test-tone" src="./assets/sfx/tone.ogg"></audio>
 
     <a-scene
diff --git a/src/room.js b/src/room.js
index 0dceade531f8a66c94635e196dcc760d18aa0fa9..d52722a30b6a338c0f42a70c83bfc26db923694c 100644
--- a/src/room.js
+++ b/src/room.js
@@ -223,7 +223,6 @@ function mountUI(scene) {
       forcedVREntryType,
       store
     }} />, document.getElementById("ui-root"));
-    document.getElementById("loader").style.display = "none";
   });
 }