diff --git a/Code/TimeCrystal.cs b/Code/TimeCrystal.cs
index 4841b3e..ca44ab4 100644
--- a/Code/TimeCrystal.cs
+++ b/Code/TimeCrystal.cs
@@ -259,8 +259,12 @@ private static void LightningRenderer_Update(On.Celeste.LightningRenderer.orig_U
 
         public static float stopTimer;
 
+        public static float prevTimer;
+
         public static int stopStage;
 
+        public static int prevStage;
+        
         private Sprite sprite;
 
         private Sprite flash;
diff --git a/Code/VitModule.cs b/Code/VitModule.cs
index 70c7a65..02de32e 100644
--- a/Code/VitModule.cs
+++ b/Code/VitModule.cs
@@ -333,9 +333,18 @@ private static void HookedKeyIceInit()
 
         private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
         {
-            //timestop crystal
-            if (!self.Paused)
+            //time crstal
+            if (self.Paused) {
+                //jank because the level becomes "paused" after this update runs, so it's easier to just revert any changes
+                //that might have happened on the next frame (and we are garunteed to have at least one frame with self.Paused=true)
+                TimeCrystal.stopStage = TimeCrystal.prevStage;
+                TimeCrystal.stopTimer = TimeCrystal.prevTimer;
+            }
+            if (!(self.FrozenOrPaused || self.unpauseTimer>0))
             {
+                //enable stupid first frame pause reversion
+                TimeCrystal.prevTimer = TimeCrystal.stopTimer;
+                TimeCrystal.prevStage = TimeCrystal.stopStage;
                 if (TimeCrystal.stopTimer > 0f)
                 {
                     TimeCrystal.stopTimer -= Engine.DeltaTime;
@@ -376,11 +385,9 @@ private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
                         }
                     }
                 }
-            }
+            
 
-            if (TimeCrystal.stopStage > 0)
-            {
-                if (!self.Paused)
+                if (TimeCrystal.stopStage > 0)
                 {
                     if (TimeCrystal.timeScaleToSet < 1)
                     {
@@ -390,34 +397,33 @@ private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
                     {
                         timeStopScaleTimer -= Engine.DeltaTime;
                     }
-                }
 
-                float timestop_delta_mult = 1;
-                if (TimeCrystal.stopStage == 1)
-                {
-                    timestop_delta_mult = Math.Max(TimeCrystal.timeScaleToSet, 1 - (timeStopScaleTimer / 0.5f));
-                }
-                else if (TimeCrystal.stopStage == 2)
-                {
-                    timestop_delta_mult = Math.Min(1, timeStopScaleTimer / 0.5f);
-                }
+                    float timestop_delta_mult = 1;
+                    if (TimeCrystal.stopStage == 1)
+                    {
+                        timestop_delta_mult = Math.Max(TimeCrystal.timeScaleToSet, 1 - (timeStopScaleTimer / 0.5f));
+                    }
+                    else if (TimeCrystal.stopStage == 2)
+                    {
+                        timestop_delta_mult = Math.Min(1, timeStopScaleTimer / 0.5f);
+                    }
 
-                if (timestop_delta_mult != 1)
-                {
-                    useTimeStopDelta = true;
-                    timeStopDelta = Engine.DeltaTime * timestop_delta_mult;
-                    timeStopRawDelta = Engine.RawDeltaTime * timestop_delta_mult;
+                    if (timestop_delta_mult != 1)
+                    {
+                        useTimeStopDelta = true;
+                        timeStopDelta = Engine.DeltaTime * timestop_delta_mult;
+                        timeStopRawDelta = Engine.RawDeltaTime * timestop_delta_mult;
+                    }
+                    else
+                    {
+                        useTimeStopDelta = false;
+                    }
                 }
                 else
                 {
                     useTimeStopDelta = false;
                 }
             }
-            else
-            {
-                useTimeStopDelta = false;
-            }
-
             //no move trigger
             if (NoMoveTrigger.stopTimer > 0f && !self.Paused)
             {
diff --git a/Code/vitmod.csproj b/Code/vitmod.csproj
index ad71ea1..761a6c3 100644
--- a/Code/vitmod.csproj
+++ b/Code/vitmod.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AssemblyName>vitmod</AssemblyName>
         <RootNamespace>vitmod</RootNamespace>
         <LangVersion>latest</LangVersion>