diff --git a/common-lib/common/variables/variables.libsonnet b/common-lib/common/variables/variables.libsonnet
index 9a1f65c73..1a8d255d7 100644
--- a/common-lib/common/variables/variables.libsonnet
+++ b/common-lib/common/variables/variables.libsonnet
@@ -59,14 +59,21 @@ local utils = import '../utils.libsonnet';
          [root.datasources.prometheus]
          + variablesFromLabels(groupLabels, instanceLabels, filteringSelector, multiInstance=false),
        queriesSelectorAdvancedSyntax:
-         '%s' % [
-           utils.labelsToPromQLSelectorAdvanced(groupLabels + instanceLabels),
-         ],
+         std.join(
+           ',',
+           std.filter(function(x) std.length(x) > 0, [
+             filteringSelector,
+             utils.labelsToPromQLSelectorAdvanced(groupLabels + instanceLabels),
+           ])
+         ),
        queriesSelector:
-         '%s,%s' % [
-           filteringSelector,
-           utils.labelsToPromQLSelector(groupLabels + instanceLabels),
-         ],
+         std.join(
+           ',',
+           std.filter(function(x) std.length(x) > 0, [
+             filteringSelector,
+             utils.labelsToPromQLSelector(groupLabels + instanceLabels),
+           ])
+         ),
 
      }
      + if enableLokiLogs then self.withLokiLogs() else {},