diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 4efafffd40..2d4eb3d341 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -452,6 +452,11 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type,
                                 }
                         }
                         *b = '\0';
+
+                        /* Make sure the value is end, so NULSTR_FOREACH can read correct match */
+                        if (b < a)
+                                b[1] = '\0';
+
                         if (bar)
                                 empty = true;