diff --git a/backend/src/main.rs b/backend/src/main.rs
index ca0c81c4b0..f1c4cd00fc 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -162,6 +162,8 @@ Windmill Community Edition {GIT_VERSION}
         "INSTANCE_EVENTS_WEBHOOK",
         "CLOUD_HOSTED",
         "GLOBAL_CACHE_INTERVAL",
+        "WORKER_TAGS",
+        "CUSTOM_TAGS",
     ]);
 
     if server_mode || num_workers > 0 {
diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs
index 48d991cb46..c4b17b3f5f 100644
--- a/backend/windmill-api/src/scripts.rs
+++ b/backend/windmill-api/src/scripts.rs
@@ -49,7 +49,7 @@ use windmill_queue::{self, schedule::push_scheduled_job, QueueTransaction};
 lazy_static::lazy_static! {
     pub static ref CUSTOM_TAGS: Vec<String> = std::env::var("CUSTOM_TAGS")
         .ok()
-        .map(|x| x.split(',').map(|x| x.to_string()).collect::<Vec<_>>()).unwrap_or_default();
+        .map(|x| x.split(',').map(|x| x.to_string()).filter(|x| !x.is_empty()).collect::<Vec<_>>()).unwrap_or_default();
 
 }