diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
index 5ee4cc6f..c5f5de9f 100644
--- a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
+++ b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
@@ -162,6 +162,10 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic
         //Get returned question (previous or next)
         $returnQuestion = $this->fetchNextQuestionQAProcessor->execute($request,  $previousAnswer);
 
+        if($returnQuestion && $returnQuestion->is_start){
+            $isNoGoingBack = 1;
+        }
+
         //When a questionnaire ended, return back the first question
         if(is_null($returnQuestion)){
             $returnQuestion = $this->fetchFirstQuestionQAProcessor->execute($request);