diff --git a/.env.testing b/.env.testing
index 35ffeb3c..864c563b 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:yZKAPw49CfEkTqkD1YU25gy+RJOnns8EJ/1CaiPbDps=
+APP_KEY=base64:XoZtpZo5SxV0uA1bMODxy2wfzZe2A4SMoxEnvj67Yz8=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_DEMO=false
diff --git a/changelog.md b/changelog.md
index 84c18a33..1a6c27f1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@
 - Fixed issue when upload doesn't start after you drag the file into empty view
 - Fixed issue when homepage flash to sign in screen after the homepage was disabled in admin panel
 - Fixed trash navigator issue
+- Fixed issue when you create plan with 0 team members amount
 
 ## Version 2.1.2
 #### Release date: 8. May 2022
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 85baf969..7fcdf265 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -28,8 +28,8 @@
     "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40",
     "/chunks/user.js": "/chunks/user.js?id=cf9a2a0d8c1fa1d9",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=ff6c1fc63a372d96",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=4f76194837113969",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=797d77ff2b1c08cc",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=0e26321285c15e1a",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=189de61fad1cd281",
     "/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5",
     "/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c",
@@ -61,8 +61,8 @@
     "/chunks/settings.js": "/chunks/settings.js?id=52f3d6db0f91fc89",
     "/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b",
-    "/chunks/billing.js": "/chunks/billing.js?id=115c25478cee576d",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ecfee7f7e98204f8",
+    "/chunks/billing.js": "/chunks/billing.js?id=a21fc7e052c60acd",
     "/chunks/platform.js": "/chunks/platform.js?id=a32da2ed3fa8918a",
     "/chunks/files.js": "/chunks/files.js?id=5f29f35c280e680b",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=6f43aea38e0927bc",
diff --git a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
index 99bb628f..e839ee6a 100644
--- a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
+++ b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
@@ -63,7 +63,7 @@ export default {
 
                 limitations.push({
                     message: payload.message[key],
-					isVisibleBar: item.total !== -1,
+					isVisibleBar: item.total !== -1 && item.total !== 0,
 					distribution: [
                         {
                             progress: item.percentage,
diff --git a/resources/js/components/UI/ProgressChart/ProgressLine.vue b/resources/js/components/UI/ProgressChart/ProgressLine.vue
index 1e9aceb4..eceb0872 100644
--- a/resources/js/components/UI/ProgressChart/ProgressLine.vue
+++ b/resources/js/components/UI/ProgressChart/ProgressLine.vue
@@ -9,8 +9,6 @@
                 }"
                 class="chart-wrapper"
             >
-                <!--<DotLabel class="label" :class="{'offset-top': chart.progress < 5}" :color="chart.color" :title="chart.value" />-->
-
                 <!--Only singe line-->
                 <span
                     v-if="data.length === 1"
diff --git a/src/App/Users/Models/UserLimitation.php b/src/App/Users/Models/UserLimitation.php
index 290c96ec..720a805c 100644
--- a/src/App/Users/Models/UserLimitation.php
+++ b/src/App/Users/Models/UserLimitation.php
@@ -94,10 +94,15 @@ class UserLimitation extends Model
         $totalUsedEmails = $memberEmails->merge($InvitationEmails)
             ->unique();
 
+        // Get usage in percent
+        $percentage = (int) $this->max_team_members === 0
+            ? 100
+            : ($totalUsedEmails->count() / $this->max_team_members) * 100;
+
         return [
             'use'        => $totalUsedEmails->count(),
             'total'      => (int) $this->max_team_members,
-            'percentage' => ($totalUsedEmails->count() / $this->max_team_members) * 100,
+            'percentage' => $percentage,
             'meta'       => [
                 'allowed_emails' => $totalUsedEmails,
             ],