diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js
index fe2948b3ac..a400c50ccf 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display.js
@@ -14,10 +14,10 @@ import autoFocuser from 'autoFocuser';
             }
         }
 
-        var settingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
+        let settingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -35,17 +35,11 @@ import autoFocuser from 'autoFocuser';
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            window.removeEventListener('beforeunload', onBeforeUnload);
-            hasChanges = false;
 
-            if (settingsInstance) {
-                settingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (settingsInstance) {
                 settingsInstance.destroy();
diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js
index 8984a8291d..e7058fd3ac 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home.js
@@ -18,10 +18,10 @@ import 'listViewStyle';
             }
         }
 
-        var homescreenSettingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
+        let homescreenSettingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -39,16 +39,11 @@ import 'listViewStyle';
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (homescreenSettingsInstance) {
-                homescreenSettingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (homescreenSettingsInstance) {
                 homescreenSettingsInstance.destroy();
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js
index edcb4e4e38..5bcf055cd3 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback.js
@@ -18,10 +18,10 @@ import 'listViewStyle';
             }
         }
 
-        var settingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
+        let settingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -39,16 +39,11 @@ import 'listViewStyle';
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (settingsInstance) {
-                settingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (settingsInstance) {
                 settingsInstance.destroy();
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index 66b41662c7..82f5270a4e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -14,10 +14,10 @@ import autoFocuser from 'autoFocuser';
             }
         }
 
-        var subtitleSettingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
+        let subtitleSettingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -35,16 +35,11 @@ import autoFocuser from 'autoFocuser';
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (subtitleSettingsInstance) {
-                subtitleSettingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (subtitleSettingsInstance) {
                 subtitleSettingsInstance.destroy();