diff --git a/CVRSuperMario64/Components/CVRSM64Mario.cs b/CVRSuperMario64/Components/CVRSM64Mario.cs
index 2b00816..72cba3a 100644
--- a/CVRSuperMario64/Components/CVRSM64Mario.cs
+++ b/CVRSuperMario64/Components/CVRSM64Mario.cs
@@ -508,9 +508,8 @@ public void ContextFixedUpdateSynced(List<CVRSM64Mario> marios) {
             }
 
             // Trigger teleport for remotes
-            if (Utils.IsTeleporting(syncedFlags) != Utils.IsTeleporting(GetCurrentState().flags)) {
-                if (Utils.IsTeleporting(syncedFlags)) TeleportStart();
-                else TeleportEnd();
+            if (Utils.IsTeleporting(syncedFlags) && Time.time > _startedTeleporting + 5 * CVRSM64Teleporter.TeleportDuration) {
+                _startedTeleporting = Time.time;
             }
         }