diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java
index 2b6a6e1d..05530e35 100644
--- a/src/main/java/mcp/mobius/waila/Waila.java
+++ b/src/main/java/mcp/mobius/waila/Waila.java
@@ -80,7 +80,7 @@ public void initialize(FMLInitializationEvent event) {
             MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
             FMLCommonHandler.instance().bus().register(new KeyEvent());
             FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());
-
+            MinecraftForge.EVENT_BUS.register(WailaTickHandler.instance());
         }
         FMLCommonHandler.instance().bus().register(new NetworkHandler());
     }
diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java
index 48e430e6..f4192c74 100644
--- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java
+++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java
@@ -10,6 +10,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.config.Configuration;
 
 import org.lwjgl.input.Keyboard;
@@ -43,7 +44,7 @@ public static WailaTickHandler instance() {
 
     @SubscribeEvent
     @SideOnly(Side.CLIENT)
-    public void tickRender(TickEvent.RenderTickEvent event) {
+    public void tickRender(RenderGameOverlayEvent.Text event) {
         OverlayRenderer.renderOverlay();
     }
 
@@ -51,6 +52,8 @@ public void tickRender(TickEvent.RenderTickEvent event) {
     @SideOnly(Side.CLIENT)
     public void tickClient(TickEvent.ClientTickEvent event) {
 
+        if (event.phase == TickEvent.Phase.START) return;
+
         if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode())
                 && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)
                 && ConfigHandler.instance()