diff --git a/src/game_interface.cpp b/src/game_interface.cpp
index b2120f2..46be362 100644
--- a/src/game_interface.cpp
+++ b/src/game_interface.cpp
@@ -119,8 +119,8 @@ namespace Hanabi
     {
       make_turn();
     }
-    while (state->draw_pile_size() < draw_pile_break or
-           (state->draw_pile_size() == draw_pile_break and state->last_action_type() == ActionType::clue))
+    while (next_action > 0 and (state->draw_pile_size() < draw_pile_break or
+           (state->draw_pile_size() == draw_pile_break and state->last_action_type() == ActionType::clue)))
     {
       revert_turn();
     }