diff --git a/code/__defines/tgs.dm b/code/__defines/tgs.dm
index 9f84fdd3cb..e164a4ec96 100644
--- a/code/__defines/tgs.dm
+++ b/code/__defines/tgs.dm
@@ -1,6 +1,6 @@
 //tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.1.0"
+#define TGS_DMAPI_VERSION "5.1.1"
 
 //All functions and datums outside this document are subject to change with any version and should not be relied on
 
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index 3abf5f284f..ccc75fe344 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -6,7 +6,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
 
 /datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version)
 	. = ..()
-	src.event_handler = version
+	src.event_handler = event_handler
 	src.version = version
 
 /datum/tgs_api/latest
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 4abd059677..2baf3e12d7 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -60,10 +60,10 @@
 #define DMAPI5_TOPIC_COMMAND_CHANGE_PORT 2
 #define DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE 3
 #define DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED 4
-#define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 4
-#define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 5
-#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 6
-#define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 7
+#define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 5
+#define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 6
+#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 7
+#define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8
 
 #define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType"
 #define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index f0c38a7c24..eedefb2877 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -16,7 +16,7 @@
 	var/list/chat_channels
 
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version("5.1.0")
+	return new /datum/tgs_version("5.1.1")
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]