diff --git a/src/main/java/thaumicenergistics/common/integration/IntegrationCore.java b/src/main/java/thaumicenergistics/common/integration/IntegrationCore.java
index b148ddf7..1ed58692 100644
--- a/src/main/java/thaumicenergistics/common/integration/IntegrationCore.java
+++ b/src/main/java/thaumicenergistics/common/integration/IntegrationCore.java
@@ -25,11 +25,6 @@ public final class IntegrationCore {
             // Integrate with NEI
             ModuleNEI.init();
         }
-
-        if (Loader.isModLoaded("Waila")) {
-            // Integrate with Waila
-            ModuleWaila.init();
-        }
     }
 
     /**
@@ -42,6 +37,10 @@ public final class IntegrationCore {
             // Integrate with client mods
             IntegrationCore.integrateWithClientMods();
         }
+        if (Loader.isModLoaded("Waila")) {
+            // The server fills in the tooltip data, so both sides have to register
+            ModuleWaila.init();
+        }
         if (Loader.isModLoaded("ComputerCraft")) {
             ModuleCC.init();
         }