diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java
index ef8d0e2c9..7eaa5d533 100644
--- a/src/main/java/noppes/npcs/CustomNpcs.java
+++ b/src/main/java/noppes/npcs/CustomNpcs.java
@@ -231,6 +231,7 @@ public class CustomNpcs {
         QuestController.instance.load();
         ScriptController.HasStart = true;
         ServerCloneController.Instance = new ServerCloneController();
+        ServerTagMapController.Instance = new ServerTagMapController();
     }
 
     @EventHandler
diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java
index 352e36fec..60746591e 100644
--- a/src/main/java/noppes/npcs/client/ClientProxy.java
+++ b/src/main/java/noppes/npcs/client/ClientProxy.java
@@ -30,10 +30,7 @@ import net.minecraftforge.common.util.FakePlayer;
 import noppes.npcs.*;
 import noppes.npcs.api.IWorld;
 import noppes.npcs.blocks.tiles.*;
-import noppes.npcs.client.controllers.ClientCloneController;
-import noppes.npcs.client.controllers.MusicController;
-import noppes.npcs.client.controllers.PresetController;
-import noppes.npcs.client.controllers.ScriptSoundController;
+import noppes.npcs.client.controllers.*;
 import noppes.npcs.client.fx.EntityElementalStaffFX;
 import noppes.npcs.client.fx.EntityEnderFX;
 import noppes.npcs.client.fx.EntityRainbowFX;
@@ -145,6 +142,7 @@ public class ClientProxy extends CommonProxy {
 		}
 
 		ClientCloneController.Instance = new ClientCloneController();
+		ClientTagMapController.Instance = new ClientTagMapController();
 
 		MinecraftForge.EVENT_BUS.register(new ClientEventHandler());