diff --git a/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java b/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
index 83a8e52892..2920331353 100644
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
@@ -68,10 +68,10 @@ public class TenantApiUsageState extends BaseApiUsageState {
         for (ApiUsageRecordKey recordKey : ApiUsageRecordKey.getKeys(feature)) {
             long value = get(recordKey);
             boolean featureEnabled = getProfileFeatureEnabled(recordKey);
-            long threshold = getProfileThreshold(recordKey);
-            long warnThreshold = getProfileWarnThreshold(recordKey);
             ApiUsageStateValue tmpValue;
             if (featureEnabled) {
+                long threshold = getProfileThreshold(recordKey);
+                long warnThreshold = getProfileWarnThreshold(recordKey);
                 if (threshold == 0 || value == 0 || value < warnThreshold) {
                     tmpValue = ApiUsageStateValue.ENABLED;
                 } else if (value < threshold) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index 09dcf2ecb2..d84c87ac51 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -110,7 +110,7 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     public boolean getProfileFeatureEnabled(ApiUsageRecordKey key) {
         switch (key) {
             case SMS_EXEC_COUNT:
-                return smsEnabled == null || smsEnabled;
+                return smsEnabled == null || Boolean.TRUE.equals(smsEnabled);
             default:
                 return true;
         }