diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
index bd308596e..5df67bb87 100644
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
@@ -1232,6 +1232,11 @@ int ShuffleAllEntrances() {
     }
   }
 
+  // Validate the world one last time to ensure all special conditions are still valid
+  if (!ValidateWorld(nullptr)) {
+    return ENTRANCE_SHUFFLE_FAILURE;
+  }
+
   return ENTRANCE_SHUFFLE_SUCCESS;
 }