diff --git a/docs/api/websockets.md b/docs/api/websockets.md
index 075439ade3..f0021704d3 100644
--- a/docs/api/websockets.md
+++ b/docs/api/websockets.md
@@ -114,8 +114,7 @@ type WebSocketData = {
   authToken: string;
 };
 
-// TypeScript: specify the type of `data`
-Bun.serve<WebSocketData>({
+Bun.serve({
   fetch(req, server) {
     const cookies = new Bun.CookieMap(req.headers.get("cookie")!);
 
@@ -131,8 +130,9 @@ Bun.serve<WebSocketData>({
     return undefined;
   },
   websocket: {
+    // TypeScript: specify the type of the ws here
     // handler called when a message is received
-    async message(ws, message) {
+    async message(ws: Bun.ServerWebSocket<WebSocketData>, message) {
       const user = getUserFromToken(ws.data.authToken);
 
       await saveMessageToDatabase({
@@ -164,22 +164,32 @@ socket.addEventListener("message", event => {
 Bun's `ServerWebSocket` implementation implements a native publish-subscribe API for topic-based broadcasting. Individual sockets can `.subscribe()` to a topic (specified with a string identifier) and `.publish()` messages to all other subscribers to that topic (excluding itself). This topic-based broadcast API is similar to [MQTT](https://en.wikipedia.org/wiki/MQTT) and [Redis Pub/Sub](https://redis.io/topics/pubsub).
 
 ```ts
-const server = Bun.serve<{ username: string }>({
+type WebSocketData = { username: string };
+
+const server = Bun.serve({
   fetch(req, server) {
     const url = new URL(req.url);
     if (url.pathname === "/chat") {
       console.log(`upgrade!`);
       const username = getUsernameFromReq(req);
-      const success = server.upgrade(req, { data: { username } });
-      return success
-        ? undefined
-        : new Response("WebSocket upgrade error", { status: 400 });
+
+      const success = server.upgrade<WebSocketData>(req, {
+        data: { username },
+      });
+
+      if (success) {
+        return;
+      }
+
+      return new Response("WebSocket upgrade error", { status: 400 });
     }
 
     return new Response("Hello world");
   },
   websocket: {
-    open(ws) {
+    // Make sure to specify the type of the `ws` argument in at
+    // least one of the websocket event handlers
+    open(ws: Bun.ServerWebSocket<WebSocketData>) {
       const msg = `${ws.data.username} has entered the chat`;
       ws.subscribe("the-group-chat");
       server.publish("the-group-chat", msg);
diff --git a/docs/guides/websocket/context.md b/docs/guides/websocket/context.md
index aab9278665..920ee351d8 100644
--- a/docs/guides/websocket/context.md
+++ b/docs/guides/websocket/context.md
@@ -7,21 +7,26 @@ When building a WebSocket server, it's typically necessary to store some identif
 With [Bun.serve()](https://bun.sh/docs/api/websockets#contextual-data), this "contextual data" is set when the connection is initially upgraded by passing a `data` parameter in the `server.upgrade()` call.
 
 ```ts
-Bun.serve<{ socketId: number }>({
+type WebSocketData = { socketId: number };
+
+Bun.serve({
   fetch(req, server) {
     const success = server.upgrade(req, {
       data: {
         socketId: Math.random(),
       },
     });
-    if (success) return undefined;
+
+    if (success) {
+      return;
+    }
 
     // handle HTTP request normally
     // ...
   },
   websocket: {
     // define websocket handlers
-    async message(ws, message) {
+    async message(ws: Bun.ServerWebSocket<WebSocketData>, message) {
       // the contextual data is available as the `data` property
       // on the WebSocket instance
       console.log(`Received ${message} from ${ws.data.socketId}}`);
@@ -42,7 +47,7 @@ type WebSocketData = {
 };
 
 // TypeScript: specify the type of `data`
-Bun.serve<WebSocketData>({
+Bun.serve({
   async fetch(req, server) {
     // use a library to parse cookies
     const cookies = parseCookies(req.headers.get("Cookie"));
@@ -60,7 +65,7 @@ Bun.serve<WebSocketData>({
     if (upgraded) return undefined;
   },
   websocket: {
-    async message(ws, message) {
+    async message(ws: Bun.ServerWebSocket<WebSocketData>, message) {
       // save the message to a database
       await saveMessageToDatabase({
         message: String(message),
diff --git a/docs/guides/websocket/pubsub.md b/docs/guides/websocket/pubsub.md
index b291a2214e..d9ccd14077 100644
--- a/docs/guides/websocket/pubsub.md
+++ b/docs/guides/websocket/pubsub.md
@@ -7,7 +7,9 @@ Bun's server-side `WebSocket` API provides a native pub-sub API. Sockets can be
 This code snippet implements a simple single-channel chat server.
 
 ```ts
-const server = Bun.serve<{ username: string }>({
+type WebSocketData = { username: string };
+
+const server = Bun.serve({
   fetch(req, server) {
     const cookies = req.headers.get("cookie");
     const username = getUsernameFromCookies(cookies);
@@ -22,7 +24,7 @@ const server = Bun.serve<{ username: string }>({
       ws.subscribe("the-group-chat");
       server.publish("the-group-chat", msg);
     },
-    message(ws, message) {
+    message(ws: Bun.ServerWebSocket<WebSocketData>, message) {
       // the server re-broadcasts incoming messages to everyone
       server.publish("the-group-chat", `${ws.data.username}: ${message}`);
     },
diff --git a/docs/guides/websocket/simple.md b/docs/guides/websocket/simple.md
index c901171c3c..9e55bed1ef 100644
--- a/docs/guides/websocket/simple.md
+++ b/docs/guides/websocket/simple.md
@@ -7,9 +7,10 @@ Start a simple WebSocket server using [`Bun.serve`](https://bun.sh/docs/api/http
 Inside `fetch`, we attempt to upgrade incoming `ws:` or `wss:` requests to WebSocket connections.
 
 ```ts
-const server = Bun.serve<{ authToken: string }>({
+const server = Bun.serve({
   fetch(req, server) {
     const success = server.upgrade(req);
+
     if (success) {
       // Bun automatically returns a 101 Switching Protocols
       // if the upgrade succeeds