diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java
index 00791452..57cd9f8b 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java
@@ -1,21 +1,39 @@
 package org.embeddedt.modernfix.common.mixin.perf.suspend_integrated_server_during_load;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.datafixers.DataFixer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.server.IntegratedServer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.Services;
+import net.minecraft.server.WorldStem;
+import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.world.level.storage.LevelStorageSource;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.duck.suspend_integrated_server_during_load.IDeferrableIntegratedServer;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.net.Proxy;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 
 @Mixin(IntegratedServer.class)
 @ClientOnlyMixin
-public abstract class IntegratedServerMixin implements IDeferrableIntegratedServer {
+public abstract class IntegratedServerMixin extends MinecraftServer implements IDeferrableIntegratedServer {
+    @Shadow
+    private boolean paused;
+
     private final AtomicBoolean mfix$hasPrimaryClientJoined = new AtomicBoolean(false);
 
+    public IntegratedServerMixin(Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository, WorldStem worldStem, Proxy proxy, DataFixer fixerUpper, Services services, ChunkProgressListenerFactory progressListenerFactory) {
+        super(serverThread, storageSource, packRepository, worldStem, proxy, fixerUpper, services, progressListenerFactory);
+    }
+
     /**
      * @author embeddedt
      * @reason Wait to be finished processing all expensive packets (recipes, tags, etc.)
@@ -26,6 +44,23 @@ public abstract class IntegratedServerMixin implements IDeferrableIntegratedServ
         return !mfix$hasPrimaryClientJoined.get() || original.call(instance);
     }
 
+    /**
+     * @author embeddedt
+     * @reason If waiting for a client connection to exist, we only need to tick the server connection,
+     * not the whole server as vanilla does.
+     */
+    @WrapWithCondition(method = "tickServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tickServer(Ljava/util/function/BooleanSupplier;)V", ordinal = 0))
+    private boolean preventRunningFullServerTick(MinecraftServer server, BooleanSupplier hasTimeLeft) {
+        if (this.paused && !mfix$hasPrimaryClientJoined.get()) {
+            var conn = this.getConnection();
+            if (conn != null) {
+                conn.tick();
+            }
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public void mfix$markClientLoadFinished() {
         mfix$hasPrimaryClientJoined.set(true);