diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a96ef7c5c6..25a585ea34 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3788,7 +3788,7 @@ void Application::loadSettings() {
     }
 
     getMyAvatar()->loadData();
-
+    setTabletVisibleToOthersSetting(false);
     _settingsLoaded = true;
 }
 
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index c2caf91045..5983d7cc25 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -102,11 +102,13 @@ void setupPreferences() {
         auto setter = [](bool value) { qApp->setHmdTabletBecomesToolbarSetting(value); };
         preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter));
     }
-    {
+    // TODO
+    // Note: If this code is added back, you must remove the line "setTabletVisibleToOthersSetting(false)" from Application::loadSettings()
+    /*{
         auto getter = []()->bool { return qApp->getTabletVisibleToOthersSetting(); };
         auto setter = [](bool value) { qApp->setTabletVisibleToOthersSetting(value); };
         preferences->addPreference(new CheckPreference(UI_CATEGORY, "Tablet Is Visible To Others", getter, setter));
-    }
+        }*/
     {
         auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); };
         auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); };