diff --git a/fabric/build.gradle b/fabric/build.gradle
index 7d59d7fe..cc50fa04 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -33,7 +33,6 @@ dependencies {
     testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
 
     modIncludeImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    modIncludeImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-models-v0", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/ModernFixClientFabric.java b/fabric/src/main/java/org/embeddedt/modernfix/ModernFixClientFabric.java
index 8b20102d..f52112a5 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/ModernFixClientFabric.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/ModernFixClientFabric.java
@@ -1,8 +1,6 @@
 package org.embeddedt.modernfix;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
 public class ModernFixClientFabric implements ClientModInitializer {
     public static ModernFixClient commonMod;
@@ -10,10 +8,5 @@ public class ModernFixClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         commonMod = new ModernFixClient();
-
-        ClientTickEvents.END_CLIENT_TICK.register((mc) -> commonMod.onRenderTickEnd());
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> {
-            commonMod.onServerStarted(server);
-        });
     }
 }
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientMinecraftServerMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientMinecraftServerMixin.java
new file mode 100644
index 00000000..30e8a494
--- /dev/null
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientMinecraftServerMixin.java
@@ -0,0 +1,18 @@
+package org.embeddedt.modernfix.fabric.mixin.core;
+
+import net.minecraft.server.MinecraftServer;
+import org.embeddedt.modernfix.ModernFixClient;
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftServer.class)
+@ClientOnlyMixin
+public class ClientMinecraftServerMixin {
+    @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0))
+    private void markServerStarted(CallbackInfo ci) {
+        ModernFixClient.INSTANCE.onServerStarted((MinecraftServer)(Object)this);
+    }
+}
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java
new file mode 100644
index 00000000..2fb3ba16
--- /dev/null
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java
@@ -0,0 +1,16 @@
+package org.embeddedt.modernfix.fabric.mixin.core;
+
+import net.minecraft.client.Minecraft;
+import org.embeddedt.modernfix.ModernFixClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class MCMixin_Fabric {
+    @Inject(method = "tick", at = @At("RETURN"))
+    private void onRenderTickEnd(CallbackInfo ci) {
+        ModernFixClient.INSTANCE.onRenderTickEnd();
+    }
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index d3d24196..729d3928 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -32,7 +32,6 @@
     "modernfix-common.mixins.json"
   ],
   "depends": {
-    "fabric-lifecycle-events-v1": "*",
     "fabric-command-api-v1": "*",
     "fabric-models-v0": "*",
     "minecraft": ">=1.16.2"