diff --git a/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js b/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
index 8bb344f8b871067a869b0c159f41b52cb696b567..e23d0ced9ce416281ab59d13dc8252927fa6ca97 100644
--- a/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
@@ -3,33 +3,42 @@ import("system.vars");
 import("system.teams");
 import("system.entities");
 import("system.db");
-import("Sql_lib");
 import("Util_lib");
+import("Sql_lib");
+import("MSTeams_lib");
 
-var data = newSelect([
-    "MST_TEAM.MST_TEAMID",
-    "MST_TEAM.TEAMNAME",
-    "MST_TEAM.IS_ARCHIVED"
-]).from("MST_TEAM").table();
-
-var idvalues = vars.get("$local.idvalues");
-if(idvalues)
+if(MSTeamsUtils.isTeamsEnabled())
 {
-    var iddata = data.filter(function(entry){return idvalues.includes(entry[0])});
-    if(iddata.length < idvalues.length)
+    var data = newSelect([
+        "MST_TEAM.MST_TEAMID",
+        "MST_TEAM.TEAMNAME",
+        "MST_TEAM.IS_ARCHIVED"
+    ]).from("MST_TEAM").table();
+
+    var idvalues = vars.get("$local.idvalues");
+    if(idvalues)
+    {
+        var iddata = data.filter(function(entry){return idvalues.includes(entry[0])});
+        if(iddata.length < idvalues.length)
+        {
+            iddata = _apiData().filter(function(entry){return idvalues.includes(entry[0])});
+        }
+        result.object(iddata);
+    }
+    else
     {
-        iddata = _apiData().filter(function(entry){return idvalues.includes(entry[0])});
+        var apiData = _apiData();
+        if(!vars.get("$param.IncludeArchived_param"))
+        {
+            apiData = apiData.filter(function(entry){return !Utils.toBoolean(entry[2])});
+        }
+        result.object(apiData);
     }
-    result.object(iddata);
 }
 else
 {
-    var apiData = _apiData();
-    if(!vars.get("$param.IncludeArchived_param"))
-    {
-        apiData = apiData.filter(function(entry){return !Utils.toBoolean(entry[2])});
-    }
-    result.object(apiData);
+    // return nothing if teams is disabled
+    result.object([]);
 }
 
 /**