diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py
index 25bfe3113e3..5647bb32c1e 100644
--- a/addons/survey/models/survey_survey.py
+++ b/addons/survey/models/survey_survey.py
@@ -298,6 +298,13 @@ class Survey(models.Model):
 
         questions = self.env['survey.question']
 
+        # First append questions without page
+        for question in self.question_ids:
+            if not question.page_id:
+                questions |= question
+
+        # Then, questions in sections
+
         for page in self.page_ids:
             if self.questions_selection == 'all':
                 questions |= page.question_ids
@@ -307,9 +314,6 @@ class Survey(models.Model):
                 else:
                     questions |= page.question_ids
 
-        if not questions:
-            questions = self.question_ids
-
         return questions
 
     def _has_attempts_left(self, partner, email, invite_token):