diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index cb33727d7..cea3585c8 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -734,7 +734,7 @@ enum Opcodes
     SMSG_LOOT_MASTER_LIST                                 = 0x0325, // 4.3.4 15595
     SMSG_SET_FORCED_REACTIONS                             = 0x4615, // 4.3.4 15595
     SMSG_SPELL_FAILED_OTHER                               = 0x4535, // 4.3.4 15595
-    SMSG_GAMEOBJECT_RESET_STATE                           = 0x12A8,
+    SMSG_GAMEOBJECT_RESET_STATE                           = 0x2A16, // 4.3.4 15595
     CMSG_REPAIR_ITEM                                      = 0x2917, // 4.3.4 15595
     SMSG_CHAT_PLAYER_NOT_FOUND                            = 0x2526, // 4.3.4 15595
     MSG_TALENT_WIPE_CONFIRM                               = 0x0107, // 4.3.4 15595
diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp
index c53ed2062..4a160ca67 100644
--- a/src/game/Server/Opcodes.cpp
+++ b/src/game/Server/Opcodes.cpp
@@ -756,7 +756,7 @@ void InitializeOpcodes()
     OPCODE(SMSG_LOOT_MASTER_LIST,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(SMSG_SET_FORCED_REACTIONS,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(SMSG_SPELL_FAILED_OTHER,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(SMSG_GAMEOBJECT_RESET_STATE,                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_GAMEOBJECT_RESET_STATE,                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_REPAIR_ITEM,                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRepairItemOpcode          );
     OPCODE(SMSG_CHAT_PLAYER_NOT_FOUND,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(MSG_TALENT_WIPE_CONFIRM,                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTalentWipeConfirmOpcode   );