diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index 6fb819ea0..1db67b1e5 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -1008,18 +1008,18 @@ enum Opcodes
     SMSG_VOICE_SESSION_ENABLE                             = 0x13B1,
     SMSG_VOICE_PARENTAL_CONTROLS                          = 0x13B2,
     CMSG_GM_WHISPER                                       = 0x13B3,
-    SMSG_GM_MESSAGECHAT                                   = 0x13B4,
+    SMSG_GM_MESSAGECHAT                                   = 0x6434, // 4.3.4 15595
     MSG_GM_GEARRATING                                     = 0x13B5,
-    CMSG_COMMENTATOR_ENABLE                               = 0x13B6,
-    SMSG_COMMENTATOR_STATE_CHANGED                        = 0x13B7,
-    CMSG_COMMENTATOR_GET_MAP_INFO                         = 0x13B8,
-    SMSG_COMMENTATOR_MAP_INFO                             = 0x13B9,
-    CMSG_COMMENTATOR_GET_PLAYER_INFO                      = 0x13BA,
+    CMSG_COMMENTATOR_ENABLE                               = 0x0B07, // 4.3.4 15595
+    SMSG_COMMENTATOR_STATE_CHANGED                        = 0x0737, // 4.3.4 15595
+    CMSG_COMMENTATOR_GET_MAP_INFO                         = 0x0026, // 4.3.4 15595
+    SMSG_COMMENTATOR_MAP_INFO                             = 0x0327, // 4.3.4 15595
+    CMSG_COMMENTATOR_GET_PLAYER_INFO                      = 0x0D14, // 4.3.4 15595
     SMSG_COMMENTATOR_GET_PLAYER_INFO                      = 0x13BB,
-    SMSG_COMMENTATOR_PLAYER_INFO                          = 0x13BC,
-    CMSG_COMMENTATOR_ENTER_INSTANCE                       = 0x13BD,
-    CMSG_COMMENTATOR_EXIT_INSTANCE                        = 0x13BE,
-    CMSG_COMMENTATOR_INSTANCE_COMMAND                     = 0x13BF,
+    SMSG_COMMENTATOR_PLAYER_INFO                          = 0x2F36, // 4.3.4 15595
+    CMSG_COMMENTATOR_ENTER_INSTANCE                       = 0x4105, // 4.3.4 15595
+    CMSG_COMMENTATOR_EXIT_INSTANCE                        = 0x6136, // 4.3.4 15595
+    CMSG_COMMENTATOR_INSTANCE_COMMAND                     = 0x0917, // 4.3.4 15595
     SMSG_CLEAR_TARGET                                     = 0x4B26, // 4.3.4 15595
     CMSG_BOT_DETECTED                                     = 0x13C1,
     SMSG_CROSSED_INEBRIATION_THRESHOLD                    = 0x2036, // 4.3.4 15595
diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp
index dd7e63b23..8bf902bec 100644
--- a/src/game/Server/Opcodes.cpp
+++ b/src/game/Server/Opcodes.cpp
@@ -1031,18 +1031,18 @@ void InitializeOpcodes()
     //OPCODE(SMSG_VOICE_SESSION_ENABLE,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(SMSG_VOICE_PARENTAL_CONTROLS,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_GM_WHISPER,                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(SMSG_GM_MESSAGECHAT,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_GM_MESSAGECHAT,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(MSG_GM_GEARRATING,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(CMSG_COMMENTATOR_ENABLE,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(SMSG_COMMENTATOR_STATE_CHANGED,               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_COMMENTATOR_GET_MAP_INFO,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(SMSG_COMMENTATOR_MAP_INFO,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_COMMENTATOR_GET_PLAYER_INFO,             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(CMSG_COMMENTATOR_ENABLE,                      STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(SMSG_COMMENTATOR_STATE_CHANGED,               STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_COMMENTATOR_GET_MAP_INFO,                STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(SMSG_COMMENTATOR_MAP_INFO,                    STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_COMMENTATOR_GET_PLAYER_INFO,             STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(SMSG_COMMENTATOR_GET_PLAYER_INFO,             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(SMSG_COMMENTATOR_PLAYER_INFO,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_COMMENTATOR_ENTER_INSTANCE,              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(CMSG_COMMENTATOR_EXIT_INSTANCE,               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    //OPCODE(CMSG_COMMENTATOR_INSTANCE_COMMAND,            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(SMSG_COMMENTATOR_PLAYER_INFO,                 STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_COMMENTATOR_ENTER_INSTANCE,              STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(CMSG_COMMENTATOR_EXIT_INSTANCE,               STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(CMSG_COMMENTATOR_INSTANCE_COMMAND,            STATUS_UNHANDLED,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     OPCODE(SMSG_CLEAR_TARGET,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_BOT_DETECTED,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     OPCODE(SMSG_CROSSED_INEBRIATION_THRESHOLD,           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );