diff --git a/build/Version.props b/build/Version.props
index 5acebbddfb..ecaea3d8d9 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -9,7 +9,7 @@
     <TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
     <TgsApiLibraryVersion>11.1.2</TgsApiLibraryVersion>
     <TgsClientVersion>13.0.0</TgsClientVersion>
-    <TgsDmapiVersion>6.6.1</TgsDmapiVersion>
+    <TgsDmapiVersion>6.6.2</TgsDmapiVersion>
     <TgsInteropVersion>5.6.2</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.4.0</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.1</TgsContainerScriptVersion>
diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index d468d60441..0cc106ec9c 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.6.1"
+#define TGS_DMAPI_VERSION "6.6.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
diff --git a/src/DMAPI/tgs/core/datum.dm b/src/DMAPI/tgs/core/datum.dm
index de420a2a32..935263cc95 100644
--- a/src/DMAPI/tgs/core/datum.dm
+++ b/src/DMAPI/tgs/core/datum.dm
@@ -12,8 +12,12 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
 	src.version = version
 
 /datum/tgs_api/proc/TerminateWorld()
-	del(world)
-	sleep(1) // https://www.byond.com/forum/post/2894866
+	while(TRUE)
+		TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]")
+		del(world)
+		world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866
+		sleep(1)
+		TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]")
 
 /datum/tgs_api/latest
 	parent_type = /datum/tgs_api/v5
diff --git a/tests/DMAPI/BasicOperation/Config.dm b/tests/DMAPI/BasicOperation/Config.dm
index 3cd3f332de..45d12ef665 100644
--- a/tests/DMAPI/BasicOperation/Config.dm
+++ b/tests/DMAPI/BasicOperation/Config.dm
@@ -1,12 +1,3 @@
-#define TGS_EXTERNAL_CONFIGURATION
-#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/##Name = ##Value
-#define TGS_READ_GLOBAL(Name) global.##Name
-#define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value
-#define TGS_PROTECT_DATUM(Path)
-#define TGS_WORLD_ANNOUNCE(message) world << ##message
 #define TGS_INFO_LOG(message) world.log << "Info: [##message]"
-#define TGS_WARNING_LOG(message) world.log << "Warn: [##message]"
 #define TGS_ERROR_LOG(message) world.log << "Err: [##message]"
-#define TGS_NOTIFY_ADMINS(event)
-#define TGS_CLIENT_COUNT 0
 #define TGS_V3_API
diff --git a/tests/DMAPI/LongRunning/Config.dm b/tests/DMAPI/LongRunning/Config.dm
index de593ce90f..3aa6b8a01c 100644
--- a/tests/DMAPI/LongRunning/Config.dm
+++ b/tests/DMAPI/LongRunning/Config.dm
@@ -1,12 +1,2 @@
-#define TGS_EXTERNAL_CONFIGURATION
-#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/##Name = ##Value
-#define TGS_READ_GLOBAL(Name) global.##Name
-#define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value
-#define TGS_PROTECT_DATUM(Path)
-#define TGS_WORLD_ANNOUNCE(message) world << ##message
 #define TGS_INFO_LOG(message) TgsInfo(##message)
-#define TGS_WARNING_LOG(message) world.log << "Warn: [##message]"
 #define TGS_ERROR_LOG(message) TgsError(##message)
-#define TGS_NOTIFY_ADMINS(event)
-#define TGS_CLIENT_COUNT 0
-#define TGS_DEBUG_LOG(message) world.log << "TGS DEBUG: [##message]"
diff --git a/tests/DMAPI/test_prelude.dm b/tests/DMAPI/test_prelude.dm
index 18b7192ec1..efb84d46ae 100644
--- a/tests/DMAPI/test_prelude.dm
+++ b/tests/DMAPI/test_prelude.dm
@@ -1,3 +1,14 @@
+#define TGS_EXTERNAL_CONFIGURATION
+#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/##Name = ##Value
+#define TGS_READ_GLOBAL(Name) global.##Name
+#define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value
+#define TGS_PROTECT_DATUM(Path)
+#define TGS_WORLD_ANNOUNCE(message) world << ##message
+#define TGS_WARNING_LOG(message) world.log << "Warn: [##message]"
+#define TGS_NOTIFY_ADMINS(event)
+#define TGS_CLIENT_COUNT 0
+#define TGS_DEBUG_LOG(message) world.log << "TGS DEBUG: [##message]"
+
 #include "..\..\src\DMAPI\tgs.dm"
 #include "..\..\src\DMAPI\tgs\includes.dm"
 #include "test_setup.dm"