diff --git a/tracardi/service/setup/setup_envs.py b/tracardi/service/setup/setup_envs.py
index e5f0695e..5da53f90 100644
--- a/tracardi/service/setup/setup_envs.py
+++ b/tracardi/service/setup/setup_envs.py
@@ -505,14 +505,17 @@ async def list_system_envs():
             cluster_wide=True
         ))
 
-    for item in com_cluster_settings:
-        _cluster_settings.append(SystemSettings(
-            label=item["label"],
-            value=await item['value'](),
-            desc=item['desc'],
-            cluster_wide=True
-        ))
+
     if License.has_license():
+
+        for item in com_cluster_settings:
+            _cluster_settings.append(SystemSettings(
+                label=item["label"],
+                value=await item['value'](),
+                desc=item['desc'],
+                cluster_wide=True
+            ))
+
         return system_settings + com_system_settings + _cluster_settings
 
     return system_settings + _cluster_settings