diff --git a/server/src/main/java/io/kroki/server/Server.java b/server/src/main/java/io/kroki/server/Server.java
index e3241e3d5..0e598a712 100644
--- a/server/src/main/java/io/kroki/server/Server.java
+++ b/server/src/main/java/io/kroki/server/Server.java
@@ -89,7 +89,10 @@ static void start(Vertx vertx, JsonObject config, Handler<AsyncResult<HttpServer
     allowedMethods.add(HttpMethod.GET);
     allowedMethods.add(HttpMethod.POST);
     allowedMethods.add(HttpMethod.OPTIONS);
-    router.route().handler(CorsHandler.create("*")
+    // REMIND: In order to accept requests with `Origin: null` header, we are using the value ".*" instead of "*".
+    // This can be reverted back to "*" once https://github.com/vert-x3/vertx-web/issues/1933 is fixed.
+    // Reference: https://github.com/yuzutech/kroki/pull/711
+    router.route().handler(CorsHandler.create(".*")
       .allowedHeaders(allowedHeaders)
       .allowedMethods(allowedMethods));
 
diff --git a/server/src/test/java/io/kroki/server/ServerTest.java b/server/src/test/java/io/kroki/server/ServerTest.java
index 508e6437a..d9d78e3f9 100644
--- a/server/src/test/java/io/kroki/server/ServerTest.java
+++ b/server/src/test/java/io/kroki/server/ServerTest.java
@@ -50,6 +50,30 @@ void http_server_check_response(Vertx vertx, VertxTestContext testContext) {
       })));
   }
 
+  @Test
+  void http_server_check_cors_handling_regular_origin(Vertx vertx, VertxTestContext testContext) {
+    WebClient client = WebClient.create(vertx);
+    client.get(port, "localhost", "/")
+      .putHeader("Origin", "http://localhost")
+      .as(BodyCodec.string())
+      .send(testContext.succeeding(response -> testContext.verify(() -> {
+        assertThat(response.statusCode()).isEqualTo(200);
+        testContext.completeNow();
+      })));
+  }
+
+  @Test
+  void http_server_check_cors_handling_null_origin(Vertx vertx, VertxTestContext testContext) {
+    WebClient client = WebClient.create(vertx);
+    client.get(port, "localhost", "/")
+      .putHeader("Origin", "null")
+      .as(BodyCodec.string())
+      .send(testContext.succeeding(response -> testContext.verify(() -> {
+        assertThat(response.statusCode()).isEqualTo(200);
+        testContext.completeNow();
+      })));
+  }
+
   @Test
   void http_server_long_uri_414(Vertx vertx, VertxTestContext testContext) {
     WebClient client = WebClient.create(vertx);