diff --git a/experiment_runner/units/game_control.pas b/experiment_runner/units/game_control.pas
index f99152f..cd580ca 100644
--- a/experiment_runner/units/game_control.pas
+++ b/experiment_runner/units/game_control.pas
@@ -1269,9 +1269,13 @@ procedure TGameControl.ReceiveRequest(var ARequest: TStringList);
   end;
 
 begin
-  if FExperiment.State = xsRunning then
+  if FExperiment.State = xsWaiting then
     begin
       if MHas(K_LOGIN) then ReplyLoginRequest;
+    end;
+
+  if FExperiment.State = xsRunning then
+    begin
       if MHas(K_RESUME) then ReplyResume;
       if MHas(K_CHOICE) then ValidateChoice;
       if MHas(K_QUESTION) then ValidateQuestionResponse;
diff --git a/experiment_runner/units/game_experiment.pas b/experiment_runner/units/game_experiment.pas
index 52eb6f5..fa971a3 100644
--- a/experiment_runner/units/game_experiment.pas
+++ b/experiment_runner/units/game_experiment.pas
@@ -817,6 +817,7 @@ begin
   FRegData := TRegData.Create(Self, LDataPath+'000.data');
   FRegChat := TRegData.Create(Self, LDataPath+'000.chat');
   WriteReportHeader;
+  State := xsWaiting;
 end;
 
 function TExperiment.LoadFromGenerator: Boolean;
--
libgit2 0.21.2