diff --git a/sgl-model-gateway/src/service_discovery.rs b/sgl-model-gateway/src/service_discovery.rs
index 0ca248d8c..3ff23bf55 100644
--- a/sgl-model-gateway/src/service_discovery.rs
+++ b/sgl-model-gateway/src/service_discovery.rs
@@ -113,13 +113,12 @@ impl PodInfo {
 
     pub fn should_include(pod: &Pod, config: &ServiceDiscoveryConfig) -> bool {
         if config.pd_mode {
-            if config.prefill_selector.is_empty() && config.decode_selector.is_empty() {
-                if !(config.igw_mode && !config.selector.is_empty()) {
-                    warn!(
-                        "PD mode enabled but both prefill_selector and decode_selector are empty"
-                    );
-                    return false;
-                }
+            if config.prefill_selector.is_empty()
+                && config.decode_selector.is_empty()
+                && (!config.igw_mode || config.selector.is_empty())
+            {
+                warn!("PD mode enabled but both prefill_selector and decode_selector are empty");
+                return false;
             }
             let matches_pd = Self::matches_selector(pod, &config.prefill_selector)
                 || Self::matches_selector(pod, &config.decode_selector);