diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 6fac4544..577cf12d 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -400,7 +400,11 @@ function get_storage_fill_percentage($used, $capacity)
     $total = intval(Metric::gigabytes($capacity)->numberOfBytes());
 
     // Count progress
-    $progress = ($used * 100) / $total;
+    if ($total == 0) {
+        $progress = 100;
+    } else {
+        $progress = ($used * 100) / $total;
+    }
 
     // Return in 2 decimal
     return number_format((float)$progress, 2, '.', '');
@@ -409,6 +413,8 @@ function get_storage_fill_percentage($used, $capacity)
 /**
  * Get user capacity fill by percentage
  *
+ * @param $id
+ * @param null $additionals
  * @return string
  */
 function user_storage_percentage($id, $additionals = null)
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 5aabe7dd..79ad2c4f 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -44,14 +44,20 @@
                                 </span>
                             </td>
                             <td>
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.used_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td v-if="config.storageLimit">
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.capacity_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td>
                                 <span class="cell-item">