diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 1efbe3ae0c..f53ceeee2e 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2287,11 +2287,8 @@ bool EntityTree::readFromMap(QVariantMap& map) {
                 properties.setKeyLightMode(COMPONENT_MODE_ENABLED);
             }
 
-            if (entityMap.contains("backgroundMode") && properties.getBackgroundModeAsString() == "skybox") {
+            if (!entityMap.contains("skyboxMode")) {
                 properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
-            } else {
-                // The content creator has set the combo to NOTHING - this is actually inherit
-                properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
             }
 
             if (!entityMap.contains("ambientLightMode")) {