diff --git a/source/funkin/ui/freeplay/FreeplayDJ.hx b/source/funkin/ui/freeplay/FreeplayDJ.hx
index 13b0d853d..6851c20b4 100644
--- a/source/funkin/ui/freeplay/FreeplayDJ.hx
+++ b/source/funkin/ui/freeplay/FreeplayDJ.hx
@@ -100,18 +100,6 @@ class FreeplayDJ extends FlxAtlasSprite
         {
           playFlashAnimation(animPrefix, true, false, true);
         }
-
-        if (getCurrentAnimation() == animPrefix && this.isLoopComplete())
-        {
-          if (timeIdling >= IDLE_EGG_PERIOD && !seenIdleEasterEgg)
-          {
-            currentState = IdleEasterEgg;
-          }
-          else if (timeIdling >= IDLE_CARTOON_PERIOD)
-          {
-            currentState = Cartoon;
-          }
-        }
         timeIdling += elapsed;
       case NewUnlock:
         var animPrefix = playableCharData.getAnimationPrefix('newUnlock');
@@ -253,6 +241,15 @@ class FreeplayDJ extends FlxAtlasSprite
     else if (name == playableCharData.getAnimationPrefix('idle'))
     {
       // trace('Finished idle');
+
+      if (timeIdling >= IDLE_EGG_PERIOD && !seenIdleEasterEgg)
+      {
+        currentState = IdleEasterEgg;
+      }
+      else if (timeIdling >= IDLE_CARTOON_PERIOD)
+      {
+        currentState = Cartoon;
+      }
     }
     else if (name == playableCharData.getAnimationPrefix('confirm'))
     {