diff --git a/app/Formatter/BoardSwimlaneFormatter.php b/app/Formatter/BoardSwimlaneFormatter.php
index 17710fc33..c2f5a3b51 100644
--- a/app/Formatter/BoardSwimlaneFormatter.php
+++ b/app/Formatter/BoardSwimlaneFormatter.php
@@ -97,8 +97,8 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
             $this->calculateStatsByColumnAcrossSwimlanes($swimlane['columns']);
         }
 
-        foreach($this->swimlanes as &$swimlane) {
-            foreach($swimlane['columns'] as $columnIndex => &$column) {
+        foreach ($this->swimlanes as &$swimlane) {
+            foreach ($swimlane['columns'] as $columnIndex => &$column) {
                 $column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'];
                 $column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score'];
             }
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index f63438c30..1bba397d4 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -19,10 +19,11 @@
                 <?= $this->task->getNewBoardTaskButton($swimlane, $column) ?>
             <?php endif ?>
 
-
+            <?php if ($column['nb_tasks'] > 0): ?>
             <span title="<?= t('Task count') ?>">
                 (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>)
             </span>
+            <?php endif ?>
 
             <span class="board-column-title">
                 <?php if ($not_editable): ?>
@@ -76,14 +77,13 @@
 
             <?php if (! empty($column['column_nb_tasks'])): ?>
             <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
-                (
-                <span><?= $column['column_nb_tasks'] ?></span>
-                <?php if ($column['task_limit']): ?>
-                    /<span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>
+                <?php if ($column['task_limit'] > 0): ?>
+                    (<span><?= $column['column_nb_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>)
+                <?php else: ?>
+                    (<span><?= $column['column_nb_tasks'] ?></span>)
                 <?php endif ?>
-                )
             </span>
-            <?php endif; ?>
+            <?php endif ?>
 	    <?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?>
         </div>