diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e0d2ab2586..e6a3ca30f3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6240,14 +6240,19 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
     const bool isModifiedQuery = !_physicsEnabled;
     if (isModifiedQuery) {
         // Create modified view that is a simple sphere.
+        bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
 
         ConicalViewFrustum sphericalView;
-        ConicalViewFrustum farView;
-
-        farView.set(_viewFrustum);
-
         sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS);
-        _octreeQuery.setConicalViews({ sphericalView, farView });
+
+        if (interstitialModeEnabled) {
+            ConicalViewFrustum farView;
+            farView.set(_viewFrustum);
+            _octreeQuery.setConicalViews({ sphericalView, farView });
+        } else {
+            _octreeQuery.setConicalViews({ sphericalView });
+        }
+
         _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
         static constexpr float MIN_LOD_ADJUST = -20.0f;
         _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);
diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp
index ba6e1dac8a..5c11c3251f 100644
--- a/interface/src/octree/SafeLanding.cpp
+++ b/interface/src/octree/SafeLanding.cpp
@@ -181,8 +181,7 @@ bool SafeLanding::isEntityLoadingComplete() {
     auto entityTree = qApp->getEntities();
     auto entityMapIter = _trackedEntities.begin();
 
-    Settings settings;
-    bool enableInterstitial = settings.value("enableIntersitialMode", false).toBool();
+    bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
 
     while (entityMapIter != _trackedEntities.end()) {
         auto entity = entityMapIter->second;
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index aaf5ca7260..3f015930f4 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -38,7 +38,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [
     //"system/chat.js"
 ];
 
-if (Settings.getValue("enableInterstitialMode", false)) {
+if (Window.interstitialModeEnabled) {
     DEFAULT_SCRIPTS_SEPARATE.push("system/interstitialPage.js");
 }