diff --git a/src/Server.zig b/src/Server.zig
index 14a16726..5b4a59a4 100644
--- a/src/Server.zig
+++ b/src/Server.zig
@@ -119,7 +119,8 @@ pub fn run(self: *Server, address: net.Address, timeout_ms: u32) !void {
             return error.ShuttingDown;
         }
 
-        self.handleConnection(socket, timeout_ms);
+        const thread = try std.Thread.spawn(.{}, handleConnection, .{ self, socket, timeout_ms });
+        thread.join();
     }
 }