diff --git a/inventory/classes/itb.yml b/inventory/classes/itb.yml
index a5dc9a37aa26ffeb0dfe5030c78d4b425ea5faa9..2d627d75c382645aae2e0f3c1a6a4c0e50082fe1 100644
--- a/inventory/classes/itb.yml
+++ b/inventory/classes/itb.yml
@@ -222,6 +222,8 @@ parameters:
     test-event-rates-on: &test-event-rates-on
       <<: *main
       enabled: true
+      factory_query_expr_match_attrs:
+        name: GLIDEIN_OVERLOAD_ENABLED
       idle_glideins_per_entry:
         max: 5
         reserve: 0
@@ -237,9 +239,8 @@ parameters:
 
     test-event-rates-off:
       <<: *test-event-rates-on
-      enabled: true
       factory_query_expr: >-
-        GLIDEIN_OVERLOAD_ENABLED=?="False" &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" &amp;&amp; !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
+         (GLIDEIN_OVERLOAD_ENABLED is undefined || GLIDEIN_OVERLOAD_ENABLED=="False") &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" &amp;&amp; !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
 
   factory_collectors:
     - node: vocms0204.cern.ch