diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 7f7f3dc954..647aa107ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -60,13 +60,13 @@ $.tablesorter.addParser({
                 </form>
             </div>
         <!-- /TMPL_IF -->
-        <!-- TMPL_UNLESS NAME="message" -->
         <div id="resultlist" class="toptabs">
             <ul>
                 <li><a href="/cgi-bin/koha/circ/waitingreserves.pl#holdswaiting"><!-- TMPL_VAR NAME="reservecount" --> Hold(s) waiting</a></li>
                 <li><a href="/cgi-bin/koha/circ/waitingreserves.pl#holdsover"><!-- TMPL_VAR NAME="overcount" --> Hold(s) over</a></li>
             </ul>
             <div id="holdswaiting">
+            <!-- TMPL_UNLESS NAME="message" -->
             <!-- TMPL_IF NAME="reserveloop" -->
                <table id="holdst">
                <thead><tr>
@@ -113,7 +113,11 @@ $.tablesorter.addParser({
                     </td>
                 </tr>
                 <!-- /TMPL_LOOP --></tbody>
-        </table>
+                </table>
+                <!-- TMPL_ELSE -->
+                    <div class="dialog message">No holds found.</div>
+                <!-- /TMPL_IF -->
+            <!-- /TMPL_UNLESS -->
         </div>
         <div id="holdsover">
                <table id="holdso">
@@ -163,12 +167,7 @@ $.tablesorter.addParser({
                 <!-- /TMPL_LOOP --></tbody>
         </table>
         </div>
-        <!-- TMPL_ELSE -->
-            <div class="dialog message">No holds found.</div>
-        <!-- /TMPL_IF -->
-        </div>
-    <!-- /TMPL_UNLESS -->
-
+    </div>
 </div>
 </div>
 </div>