diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs
index 99d0164..dd7e285 100644
--- a/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs
+++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs
@@ -64,6 +64,7 @@ namespace SepCore.EnemyManager
 
             _baseDuration = level.Duration;
             _duration = _baseDuration;
+            _currentLevel = level.Id;
 
             _spawnScheduler.Init(level);
             _enemyRegistry.Clear();
@@ -85,7 +86,7 @@ namespace SepCore.EnemyManager
         public void OnReset()
         {
             _spawnScheduler.Reset();
-            _enemyRegistry.Clear();
+            ClearEnemies();
             _currentSpawnEnemyId = 0;
             _currentLevel = 0;
             _baseDuration = 0;
@@ -110,7 +111,10 @@ namespace SepCore.EnemyManager
                 return;
             }
 
-            enemy.SetTarget(_player);
+            if (_player != null)
+            {
+                enemy.SetTarget(_player);
+            }
             _enemyRegistry.Register(enemy);
         }