diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java
index 15d5229006..dfdcf1b4e5 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java
@@ -180,7 +180,7 @@ public class ChatboxPanelManager
 			log.warn("Exception closing {}", currentInput.getClass(), e);
 		}
 
-		// eventBus.unregister(currentInput);
+		eventBus.unregister(currentInput);
 		if (currentInput instanceof KeyListener)
 		{
 			keyManager.unregisterKeyListener((KeyListener) currentInput);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 40b199cfe6..43620893b5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -392,7 +392,7 @@ public class PluginManager
 		try
 		{
 			unschedule(plugin);
-			// eventBus.unregister(plugin);
+			eventBus.unregister(plugin);
 
 			// plugins always stop in the event thread
 			SwingUtilities.invokeAndWait(() ->
diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java
index d7cdaed8fe..7ee02b398a 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java
@@ -192,7 +192,7 @@ public class GameEventManager
 				});
 			});
 
-			// eventBus.unregister(subscriber);
+			eventBus.unregister(subscriber);
 		});
 	}
 }