diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a96ef7c5c6..32d2ee506b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2000,7 +2000,7 @@ void Application::initializeUi() {
     rootContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     rootContext->setContextProperty("AudioDevice", AudioDeviceScriptingInterface::getInstance());
 
-    // Caches
+    
     rootContext->setContextProperty("AnimationCache", DependencyManager::get<AnimationCache>().data());
     rootContext->setContextProperty("TextureCache", DependencyManager::get<TextureCache>().data());
     rootContext->setContextProperty("ModelCache", DependencyManager::get<ModelCache>().data());
@@ -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 5c239f6e13..5983d7cc25 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -103,6 +103,7 @@ void setupPreferences() {
         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); };