Improve serviceLimit implementation

1 files changed, 3 insertions, 3 deletions

diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js
index 752f71371..9836c5f51 100644
--- a/src/features/serviceLimit/store.js
+++ b/src/features/serviceLimit/store.js
@@ -24,12 +24,12 @@ export class ServiceLimitStore extends FeatureStore {
   @computed get userHasReachedServiceLimit() {
     if (!this.isServiceLimitEnabled) return false;
 
-    const { user } = this.stores;
-
-    return !user.isPremium && this.serviceCount >= this.serviceLimit;
+    return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
   }
 
   @computed get serviceLimit() {
+    if (!this.isServiceLimitEnabled || this.stores.features.features.serviceLimitCount === 0) return 0;
+
     return this.stores.features.features.serviceLimitCount || DEFAULT_SERVICE_LIMIT;
   }