diff --git a/build/Version.props b/build/Version.props
index 3602e14394..63918ebbe0 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -8,7 +8,7 @@
     <TgsApiVersion>9.9.0</TgsApiVersion>
     <TgsApiLibraryVersion>10.3.0</TgsApiLibraryVersion>
     <TgsClientVersion>11.3.0</TgsClientVersion>
-    <TgsDmapiVersion>6.3.0</TgsDmapiVersion>
+    <TgsDmapiVersion>6.3.1</TgsDmapiVersion>
     <TgsInteropVersion>5.5.0</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.2.1</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.1</TgsContainerScriptVersion>
diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index e35ccb69d1..80df9d1d54 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.3.0"
+#define TGS_DMAPI_VERSION "6.3.1"
 
 // 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/v5/api.dm b/src/DMAPI/tgs/v5/api.dm
index 0e75b0de1c..4bf593f35d 100644
--- a/src/DMAPI/tgs/v5/api.dm
+++ b/src/DMAPI/tgs/v5/api.dm
@@ -133,7 +133,11 @@
 			var/result = HandleCustomCommand(topic_parameters[DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND])
 			if(!result)
 				result = TopicResponse("Error running chat command!")
-			result[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue
+			//TODO: make this not need the decode/encode.
+			if (length(intercepted_message_queue))
+				var/list/result_array = json_decode(result)
+				result_array[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue
+				result = json_encode(result_array)
 			intercepted_message_queue = null
 			return result
 		if(DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION)