diff --git a/include/config/config_debug_features.h b/include/config/config_debug_features.h
index 574e3b04c..8be839fda 100644
--- a/include/config/config_debug_features.h
+++ b/include/config/config_debug_features.h
@@ -54,7 +54,7 @@
 
 /**** [MAP SELECT] ****/
 // ``IS_MAP_SELECT_ENABLED``
-#define ENABLE_MAP_SELECT false
+#define ENABLE_MAP_SELECT true
 
 /**** [DEBUG FILE 1] ****/
 // ``IS_DEBUG_SAVE_ENABLED``
diff --git a/include/config/config_game.h b/include/config/config_game.h
index b8b2385bd..f46c6bf89 100644
--- a/include/config/config_game.h
+++ b/include/config/config_game.h
@@ -16,6 +16,7 @@
 */
 #define ENABLE_F3DEX3 true
 #define ENABLE_F3DEX3_RECOMMENDATIONS true // missing matrix stuff + fast64 re-export process
+#define ENABLE_F3DEX3_NOSYNCS false // not working properly currently
 #define ENABLE_F3DEX3_LIGHT_RECO false // unfinished, faster but experimental (reco -> recommendations)
 // #define ENABLE_F3DEX3_NEW_FEATURES true // not implemented yet
 
diff --git a/include/config/config_safeguards.h b/include/config/config_safeguards.h
index 33cf4844b..3e03aa903 100644
--- a/include/config/config_safeguards.h
+++ b/include/config/config_safeguards.h
@@ -107,14 +107,21 @@
 /*****************
  * config_game.h
  */
-#if !ENABLE_F3DEX3 && ENABLE_F3DEX3_RECOMMENDATIONS
-    #undef ENABLE_F3DEX3_RECOMMENDATIONS
-    #define ENABLE_F3DEX3_RECOMMENDATIONS false
-#endif
+#if !ENABLE_F3DEX3
+    #if ENABLE_F3DEX3_RECOMMENDATIONS
+        #undef ENABLE_F3DEX3_RECOMMENDATIONS
+        #define ENABLE_F3DEX3_RECOMMENDATIONS false
+    #endif
 
-#if !ENABLE_F3DEX3 && ENABLE_F3DEX3_NEW_FEATURES
-    #undef ENABLE_F3DEX3_NEW_FEATURES
-    #define ENABLE_F3DEX3_NEW_FEATURES false
+    #if ENABLE_F3DEX3_NEW_FEATURES
+        #undef ENABLE_F3DEX3_NEW_FEATURES
+        #define ENABLE_F3DEX3_NEW_FEATURES false
+    #endif
+
+    #if ENABLE_F3DEX3_NOSYNCS
+        #undef ENABLE_F3DEX3_NOSYNCS
+        #define ENABLE_F3DEX3_NOSYNCS false
+    #endif
 #endif
 
 #if FORCE_WIDESCREEN
diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h
index 816cc3dab..b08cb631a 100644
--- a/include/ultra64/gbi.h
+++ b/include/ultra64/gbi.h
@@ -7,7 +7,7 @@
 
 #if ENABLE_F3DEX3
     #define REQUIRE_SEMICOLONS_AFTER_GBI_COMMANDS
-    #if ENABLE_F3DEX3_RECOMMENDATIONS
+    #if ENABLE_F3DEX3_NOSYNCS
         #define NO_SYNCS_IN_TEXTURE_LOADS
     #endif
     #include "gbi.f3dex3.h"