diff --git a/src/systems/app-mode.js b/src/systems/app-mode.js
index 4dff5c05ac1a8061fe6bd6e348df2a5edd25a8ac..421bf48abbab344b877f9805803a7dfe30472336 100644
--- a/src/systems/app-mode.js
+++ b/src/systems/app-mode.js
@@ -175,10 +175,10 @@ AFRAME.registerComponent("vr-mode-toggle-visibility", {
 
   init() {
     this.updateComponentState = this.updateComponentState.bind(this);
-    this.updateComponentState();
   },
 
   play() {
+    this.updateComponentState();
     this.el.sceneEl.addEventListener("enter-vr", this.updateComponentState);
     this.el.sceneEl.addEventListener("exit-vr", this.updateComponentState);
   },