diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index 9d52f34c010..d0a647c6772 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -393,6 +393,10 @@ func typedVal(v []rune, st bool) interface{} {
 		return nil
 	}
 
+	if strings.EqualFold(val, "0") {
+		return int64(0)
+	}
+
 	// If this value does not start with zero, try parsing it to an int
 	if len(val) != 0 && val[0] != '0' {
 		if iv, err := strconv.ParseInt(val, 10, 64); err == nil {
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index a096f16d2b0..5d77aed18d8 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -85,6 +85,11 @@ func TestParseSet(t *testing.T) {
 			expect: map[string]interface{}{"is_null": "null"},
 			err:    false,
 		},
+		{
+			str:    "zero=0",
+			expect: map[string]interface{}{"zero": "0"},
+			err:    false,
+		},
 	}
 	tests := []struct {
 		str    string
@@ -123,6 +128,10 @@ func TestParseSet(t *testing.T) {
 			str:    "leading_zeros=00009",
 			expect: map[string]interface{}{"leading_zeros": "00009"},
 		},
+		{
+			str:    "zero_int=0",
+			expect: map[string]interface{}{"zero_int": 0},
+		},
 		{
 			str:    "long_int=1234567890",
 			expect: map[string]interface{}{"long_int": 1234567890},