diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp
index 35d261d19e..294370aa0f 100644
--- a/common/json-schema-to-grammar.cpp
+++ b/common/json-schema-to-grammar.cpp
@@ -195,6 +195,7 @@ static void _generate_min_max_int(int min_value, int max_value, std::stringstrea
         if (min_value == 0) {
             if (top_level) {
                 out << "[1-9] ";
+                out << "[0] | [1-9] ";
                 more_digits(0, less_decimals);
             } else {
                 more_digits(1, decimals_left);
diff --git a/tests/test-json-schema-to-grammar.cpp b/tests/test-json-schema-to-grammar.cpp
index e001ef9fba..0fcf25b95e 100755
--- a/tests/test-json-schema-to-grammar.cpp
+++ b/tests/test-json-schema-to-grammar.cpp
@@ -88,7 +88,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase
             "minimum": 0
         })""",
         R"""(
-            root ::= ([1-9] [0-9]{0,15}) space
+            root ::= ([0] | [1-9] [0-9]{0,15}) space
             space ::= " "?
         )"""
     });