diff --git a/app/Model/ProjectAnalytic.php b/app/Model/ProjectAnalytic.php
index b62248eb9..46f2242de 100644
--- a/app/Model/ProjectAnalytic.php
+++ b/app/Model/ProjectAnalytic.php
@@ -34,6 +34,10 @@ class ProjectAnalytic extends Base
             );
         }
 
+        if ($total === 0) {
+            return array();
+        }
+
         foreach ($metrics as &$metric) {
             $metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2);
         }
@@ -71,6 +75,10 @@ class ProjectAnalytic extends Base
             $metrics[$user]['nb_tasks']++;
         }
 
+        if ($total === 0) {
+            return array();
+        }
+
         foreach ($metrics as &$metric) {
             $metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2);
         }
diff --git a/app/Template/analytic/tasks.php b/app/Template/analytic/tasks.php
index 7ae9c254d..01338d2e1 100644
--- a/app/Template/analytic/tasks.php
+++ b/app/Template/analytic/tasks.php
@@ -1,29 +1,34 @@
 <div class="page-header">
     <h2><?= t('Task distribution') ?></h2>
 </div>
-<section id="analytic-task-repartition">
 
-<div id="chart" data-url="<?= Helper\u('analytic', 'tasks', array('project_id' => $project['id'])) ?>"></div>
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data.') ?></p>
+<?php else: ?>
+    <section id="analytic-task-repartition">
 
-<table>
-    <tr>
-        <th><?= t('Column') ?></th>
-        <th><?= t('Number of tasks') ?></th>
-        <th><?= t('Percentage') ?></th>
-    </tr>
-    <?php foreach ($metrics as $metric): ?>
-    <tr>
-        <td>
-            <?= Helper\escape($metric['column_title']) ?>
-        </td>
-        <td>
-            <?= $metric['nb_tasks'] ?>
-        </td>
-        <td>
-            <?= n($metric['percentage']) ?>%
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
+    <div id="chart" data-url="<?= Helper\u('analytic', 'tasks', array('project_id' => $project['id'])) ?>"></div>
 
-</section>
+    <table>
+        <tr>
+            <th><?= t('Column') ?></th>
+            <th><?= t('Number of tasks') ?></th>
+            <th><?= t('Percentage') ?></th>
+        </tr>
+        <?php foreach ($metrics as $metric): ?>
+        <tr>
+            <td>
+                <?= Helper\escape($metric['column_title']) ?>
+            </td>
+            <td>
+                <?= $metric['nb_tasks'] ?>
+            </td>
+            <td>
+                <?= n($metric['percentage']) ?>%
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    </section>
+<?php endif ?>
diff --git a/app/Template/analytic/users.php b/app/Template/analytic/users.php
index 89f00686f..28e2fbbcc 100644
--- a/app/Template/analytic/users.php
+++ b/app/Template/analytic/users.php
@@ -1,29 +1,34 @@
 <div class="page-header">
     <h2><?= t('User repartition') ?></h2>
 </div>
-<section id="analytic-user-repartition">
 
-<div id="chart" data-url="<?= Helper\u('analytic', 'users', array('project_id' => $project['id'])) ?>"></div>
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data.') ?></p>
+<?php else: ?>
+    <section id="analytic-user-repartition">
 
-<table>
-    <tr>
-        <th><?= t('User') ?></th>
-        <th><?= t('Number of tasks') ?></th>
-        <th><?= t('Percentage') ?></th>
-    </tr>
-    <?php foreach ($metrics as $metric): ?>
-    <tr>
-        <td>
-            <?= Helper\escape($metric['user']) ?>
-        </td>
-        <td>
-            <?= $metric['nb_tasks'] ?>
-        </td>
-        <td>
-            <?= n($metric['percentage']) ?>%
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
+    <div id="chart" data-url="<?= Helper\u('analytic', 'users', array('project_id' => $project['id'])) ?>"></div>
 
-</section>
+    <table>
+        <tr>
+            <th><?= t('User') ?></th>
+            <th><?= t('Number of tasks') ?></th>
+            <th><?= t('Percentage') ?></th>
+        </tr>
+        <?php foreach ($metrics as $metric): ?>
+        <tr>
+            <td>
+                <?= Helper\escape($metric['user']) ?>
+            </td>
+            <td>
+                <?= $metric['nb_tasks'] ?>
+            </td>
+            <td>
+                <?= n($metric['percentage']) ?>%
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    </section>
+<?php endif ?>