diff --git a/Assets/Scripts/Manager/EnemySpawnManager.cs b/Assets/Scripts/Manager/EnemySpawnManager.cs
index 648de7d..3d7775a 100644
--- a/Assets/Scripts/Manager/EnemySpawnManager.cs
+++ b/Assets/Scripts/Manager/EnemySpawnManager.cs
@@ -44,6 +44,8 @@ public class EnemySpawnManager : MonoBehaviour
 
     public void OnPlayButtonClicked()
     {
+        if (GameManager.Instance.CurrentNumEnemies != 0) return;
+
         HasStarted = true;
         PopWave();
     }
@@ -58,7 +60,7 @@ public class EnemySpawnManager : MonoBehaviour
         if (HasStarted && IsAutoPlaying)
             time += Time.deltaTime;
 
-        if (waveQueue.Count > 0 && waveQueue.Peek().spawnTime < time)
+        if (waveQueue.Count > 0 && (GameManager.Instance.CurrentNumEnemies == 0 && IsAutoPlaying))
         {
             PopWave();
         }