diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index 18f14a82902..c92b5fbe5e9 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -21,10 +21,9 @@
       <div id="content" class="container">
         {% block main_content %}
           {% block flash %}
-            {% set flash_messages = h.flash.pop_messages() | list %}
             <div class="flash-messages">
               {% block flash_inner %}
-                {% for message in flash_messages %}
+                {% for message in h.flash.pop_messages() | list %}
                   <div class="alert fade in {{ message.category }}">
                     {{ h.literal(message) }}
                   </div>