diff --git a/app/views/plans/export.docx.erb b/app/views/plans/export.docx.erb
index 0ea56f4..7f9c2c2 100644
--- a/app/views/plans/export.docx.erb
+++ b/app/views/plans/export.docx.erb
@@ -16,30 +16,32 @@
 
 
 <% @exported_plan.sections.each do |section| %>
-  <h3><%= section.title %></h3>
-  <% questions = @exported_plan.questions_for_section(section.id) %>
-  <% questions.each do |question| %>
-    <p>
-      <%= raw question.text %>
-    </p>
-
-    <% answer = @plan.answer(question.id, false) %>
-    <% if answer.nil? then %>
-      <p><%= _('Question not answered') %></p>
-    <% else %>
-      <% q_format = question.question_format %>
-      <% if q_format.option_based? %>
-        <ul>
-          <% answer.question_options.each do |option| %>
-            <li><%= raw option.text %></li>
-          <% end %>
-        </ul>
-        <% if question.option_comment_display %>
-          <%= raw answer.text %>
-        <% end %>
-      <%else%>
-        <%= raw answer.text %>
-      <%end%>
-    <% end %>	
-  <% end %>
-<% end %>
+  <% questions = @exported_plan.questions_for_section(section.id)
+    if questions.present?
+  %>
+      <h3><%= section.title %></h3>
+      <% questions.each do |question| %>
+        <p>
+          <%= raw question.text %>
+        </p>
+        <% answer = @plan.answer(question.id, false) %>
+        <% if answer.nil? %>
+          <p><%= _('Question not answered') %></p>
+        <% else %>
+          <% q_format = question.question_format %>
+          <% if q_format.option_based? %>
+              <ul>
+                <% answer.question_options.each do |option| %>
+                  <li><%= raw option.text %></li>
+                <% end %>
+              </ul>
+            <% if question.option_comment_display %>
+              <%= raw answer.text %>
+            <% end %>
+          <% else %>
+            <%= raw answer.text %>
+          <% end %> <!-- end if q_format.option_based? -->
+        <% end%> <!-- end if answer.nil? --> 
+    <% end %>	<!-- end questions.each -->
+  <% end %> <!-- end if questions.present? -->
+<% end %> <!-- end @exported_plan.sections.each -->