diff --git a/ChangeLog b/ChangeLog
index a346acff4..4c7dcf225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ Core functionalities moved to plugins:
 
 Improvements:
 
+* Do not show empty swimlanes in public view
 * Change swimlane layout to save space on the screen
 * Add the possibility to set/unset max column height (column scrolling)
 * Show "Open this task" in dropdown menu for closed tasks
diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php
index fb9212a78..83587c44f 100644
--- a/app/Template/board/table_container.php
+++ b/app/Template/board/table_container.php
@@ -25,20 +25,24 @@
                 )) ?>
             <?php endif ?>
 
-            <?php if ($swimlane['nb_swimlanes'] > 1): ?>
-                <?= $this->render('board/table_swimlane', array(
+            <?php if (! ($swimlane['nb_tasks'] === 0 && isset($not_editable))): ?>
+
+                <?php if ($swimlane['nb_swimlanes'] > 1): ?>
+                    <?= $this->render('board/table_swimlane', array(
+                        'project' => $project,
+                        'swimlane' => $swimlane,
+                        'not_editable' => isset($not_editable),
+                    )) ?>
+                <?php endif ?>
+
+                <?= $this->render('board/table_tasks', array(
                     'project' => $project,
                     'swimlane' => $swimlane,
                     'not_editable' => isset($not_editable),
+                    'board_highlight_period' => $board_highlight_period,
                 )) ?>
-            <?php endif ?>
 
-            <?= $this->render('board/table_tasks', array(
-                'project' => $project,
-                'swimlane' => $swimlane,
-                'not_editable' => isset($not_editable),
-                'board_highlight_period' => $board_highlight_period,
-            )) ?>
+            <?php endif ?>
 
         <?php endif ?>
     <?php endforeach ?>