diff --git a/Marechai.Server/Program.cs b/Marechai.Server/Program.cs
index dd42e12e..5dd4138c 100644
--- a/Marechai.Server/Program.cs
+++ b/Marechai.Server/Program.cs
@@ -182,8 +182,15 @@ file class Program
                     options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
                     options.JsonSerializerOptions.WriteIndented        = true;
                     options.JsonSerializerOptions.ReferenceHandler     = ReferenceHandler.IgnoreCycles;
+                    options.JsonSerializerOptions.NumberHandling       = JsonNumberHandling.Strict;
                 });
 
+        builder.Services.ConfigureHttpJsonOptions(options =>
+        {
+            // Tell OpenAPI generator to report number fields as integers/floats only, not strings
+            options.SerializerOptions.NumberHandling = JsonNumberHandling.Strict;
+        });
+
         // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
         builder.Services.AddOpenApi();