diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
index 85c0a19b9c..daf1102497 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -567,5 +567,15 @@ public void setDebugLoggingEnabled(boolean isEnabled) {
         editor.putBoolean(mContext.getString(R.string.settings_key_debug_logging), isEnabled);
         editor.commit();
     }
+
+    public boolean isAutoplayEnabled() {
+        return mPrefs.getBoolean(mContext.getString(R.string.settings_key_autoplay), AUTOPLAY_ENABLED);
+    }
+
+    public void setAutoplayEnabled(boolean isEnabled) {
+        SharedPreferences.Editor editor = mPrefs.edit();
+        editor.putBoolean(mContext.getString(R.string.settings_key_autoplay), isEnabled);
+        editor.commit();
+    }
 }
 
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
index 63fde33227..2fb6762c0a 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
@@ -72,6 +72,7 @@ public void setContext(Context context, Bundle aExtras) {
             runtimeSettingsBuilder.displayDpiOverride(SettingsStore.getInstance(context).getDisplayDpi());
             runtimeSettingsBuilder.screenSizeOverride(SettingsStore.getInstance(context).getMaxWindowWidth(),
                     SettingsStore.getInstance(context).getMaxWindowHeight());
+            runtimeSettingsBuilder.autoplayDefault(SettingsStore.getInstance(mContext).isAutoplayEnabled() ? GeckoRuntimeSettings.AUTOPLAY_DEFAULT_ALLOWED : GeckoRuntimeSettings.AUTOPLAY_DEFAULT_BLOCKED);
 
             if (SettingsStore.getInstance(context).getTransparentBorderWidth() > 0) {
                 runtimeSettingsBuilder.useMaxScreenDepth(true);
@@ -218,6 +219,7 @@ public void setAutoplayEnabled(final boolean enabled) {
             mRuntime.getSettings().setAutoplayDefault(enabled ?
                     GeckoRuntimeSettings.AUTOPLAY_DEFAULT_ALLOWED :
                     GeckoRuntimeSettings.AUTOPLAY_DEFAULT_BLOCKED);
+            SettingsStore.getInstance(mContext).setAutoplayEnabled(enabled);
         }
     }
 
diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
index 446b8d45d9..d764e72efb 100644
--- a/app/src/main/res/values/non_L10n.xml
+++ b/app/src/main/res/values/non_L10n.xml
@@ -45,6 +45,8 @@
     <string name="settings_key_browser_world_height" translatable="false">settings_browser_world_height</string>
     <string name="settings_key_notifications" translatable="false">settings_key_notifications</string>
     <string name="settings_key_debug_logging" translatable="false">settings_key_debug_logging</string>
+    <string name="settings_key_autoplay" translatable="false">settings_key_autoplay</string>
+
     <string name="environment_override_help_url" translatable="false">https://github.com/MozillaReality/FirefoxReality/wiki/Environments</string>
     <string name="private_policy_url" translatable="false">https://www.mozilla.org/privacy/firefox/</string>
     <string name="private_report_url" translatable="false">https://mixedreality.mozilla.org/fxr/report?src=browser-fxr&amp;label=browser-firefox-reality&amp;url=%1$s</string>