diff --git a/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Download.cs b/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Download.cs
index ff4580c5a..7bad7ec4a 100644
--- a/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Download.cs	
+++ b/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Download.cs	
@@ -7,6 +7,9 @@ public static partial class PluginFactory
 {
     public static async Task<EntityTagHeaderValue?> DetermineConfigPluginETagAsync(Guid configPlugId, string configServerUrl, CancellationToken cancellationToken = default)
     {
+        if(configPlugId == Guid.Empty || string.IsNullOrWhiteSpace(configServerUrl))
+            return null;
+        
         try
         {
             var serverUrl = configServerUrl.EndsWith('/') ? configServerUrl[..^1] : configServerUrl;
diff --git a/app/MindWork AI Studio/Tools/Services/EnterpriseEnvironmentService.cs b/app/MindWork AI Studio/Tools/Services/EnterpriseEnvironmentService.cs
index ac41b4bae..432796e40 100644
--- a/app/MindWork AI Studio/Tools/Services/EnterpriseEnvironmentService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/EnterpriseEnvironmentService.cs	
@@ -54,6 +54,7 @@ private async Task StartUpdating(bool isFirstRun = false)
                 switch (enterpriseConfigServerUrl)
                 {
                     case null when enterpriseConfigId == Guid.Empty:
+                    case not null when string.IsNullOrWhiteSpace(enterpriseConfigServerUrl) && enterpriseConfigId == Guid.Empty:
                         logger.LogInformation("AI Studio runs without an enterprise configuration.");
                         break;
 
@@ -61,7 +62,7 @@ private async Task StartUpdating(bool isFirstRun = false)
                         logger.LogWarning($"AI Studio runs with an enterprise configuration id ('{enterpriseConfigId}'), but the configuration server URL is not set.");
                         break;
 
-                    case not null when enterpriseConfigId == Guid.Empty:
+                    case not null when !string.IsNullOrWhiteSpace(enterpriseConfigServerUrl) && enterpriseConfigId == Guid.Empty:
                         logger.LogWarning($"AI Studio runs with an enterprise configuration server URL ('{enterpriseConfigServerUrl}'), but the configuration ID is not set.");
                         break;