diff --git a/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java
index 3fb1bff8..f72dd86e 100644
--- a/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java
+++ b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java
@@ -161,7 +161,9 @@ private List<TokenExtractionRule> convertTokenExtractionRules(
         .map(
             rule ->
                 new ConvertedTokenExtractionRule(
-                    rule.getKey(), rule.getAlias(), rule.getRegexCapture()))
+                    rule.getKey(),
+                    rule.hasAlias() ? rule.getAlias() : null,
+                    rule.hasRegexCapture() ? rule.getRegexCapture() : null))
         .collect(Collectors.toList());
   }