diff --git a/src/main/java/li/cil/oc2/common/CommonSetup.java b/src/main/java/li/cil/oc2/common/CommonSetup.java
index c15adabb..ad552621 100644
--- a/src/main/java/li/cil/oc2/common/CommonSetup.java
+++ b/src/main/java/li/cil/oc2/common/CommonSetup.java
@@ -6,6 +6,7 @@ import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters;
 import li.cil.oc2.common.integration.IMC;
 import li.cil.oc2.common.network.Network;
 import li.cil.oc2.common.util.ServerScheduler;
+import li.cil.oc2.common.vxlan.TunnelManager;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 
@@ -16,5 +17,6 @@ public final class CommonSetup {
         Network.initialize();
         RPCMethodParameterTypeAdapters.initialize();
         ServerScheduler.initialize();
+        TunnelManager.initialize();
     }
 }
diff --git a/src/main/java/li/cil/oc2/common/Main.java b/src/main/java/li/cil/oc2/common/Main.java
index 5a3a7cf4..ff20757e 100644
--- a/src/main/java/li/cil/oc2/common/Main.java
+++ b/src/main/java/li/cil/oc2/common/Main.java
@@ -23,7 +23,6 @@ import li.cil.oc2.common.tags.ItemTags;
 import li.cil.oc2.common.util.RegistryUtils;
 import li.cil.oc2.common.util.SoundEvents;
 import li.cil.oc2.common.vm.provider.DeviceTreeProviders;
-import li.cil.oc2.common.vxlan.TunnelManager;
 import li.cil.sedna.Sedna;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
@@ -58,7 +57,6 @@ public final class Main {
 
         BlockDeviceDataRegistry.initialize();
         FirmwareRegistry.initialize();
-        TunnelManager.initialize();
 
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize);