diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 3d445570c5c..0a73c4a58ef 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -52,6 +52,10 @@ class WebsiteSurvey(http.Controller):
if survey.stage_id.closed:
return request.website.render("survey.notopen")
+ # If there is no pages
+ if not survey.page_ids:
+ return request.website.render("survey.nopages")
+
# Everything seems to be ok
return None
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index feb36580474..626adff105a 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -31,6 +31,20 @@
+
+
+
+