diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java
index dbd908247..b8020addd 100644
--- a/src/main/java/appeng/client/gui/AEBaseGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseGui.java
@@ -104,6 +104,7 @@ public abstract class AEBaseGui extends GuiContainer
 		super( container );
 		this.subGui = switchingGuis;
 		switchingGuis = false;
+		// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
 		MinecraftForge.EVENT_BUS.register( this );
 	}
 
@@ -585,6 +586,7 @@ public abstract class AEBaseGui extends GuiContainer
 		return false;
 	}
 
+	// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
 	public void onGuiOpenEvent(GuiOpenEvent event) { // Why oh why mezz? (RecipesGui.java, displayGuiScreenWithoutClose()
 		if(event.getGui() instanceof IRecipesGui)
 		{
@@ -597,6 +599,8 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		super.onGuiClosed();
 		this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI )
+		// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
+		MinecraftForge.EVENT_BUS.unregister( this );
 	}
 
 	protected Slot getSlot( final int mouseX, final int mouseY )
diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
index f882e6eb6..5e917c75f 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
@@ -383,6 +383,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		memoryText = this.searchField.getText();
 	}
 
+	// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
 	@Override
 	@SubscribeEvent
 	public void onGuiOpenEvent(GuiOpenEvent event) {