diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index bc1883e..dfb2d2d 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -26,9 +26,8 @@ function createNotesStore() {
 				return;
 			}
 
-			const newNote: Note = {
+			const newNote = {
 				...note,
-				id: crypto.randomUUID(),
 				createdAt: new Date(),
 				updatedAt: new Date()
 			};
@@ -45,8 +44,15 @@ function createNotesStore() {
 				throw new Error('Failed to create note');
 			}
 
-			// Update local store after successful server update
-			innerUpdate((notes) => [...notes, newNote]);
+			// Get the created note with server-generated ID
+			const createdNote = await response.json();
+
+			// Convert date strings to Date objects
+			createdNote.createdAt = new Date(createdNote.createdAt);
+			createdNote.updatedAt = new Date(createdNote.updatedAt);
+
+			// Update local store with the server response
+			innerUpdate((notes) => [...notes, createdNote]);
 		},
 		update: async (id: string, content: Partial<Note>) => {
 			const response = await fetch(`/api/notes/${id}`, {
diff --git a/go.mod b/go.mod
index ddda0f5..c850a6f 100644
--- a/go.mod
+++ b/go.mod
@@ -3,3 +3,5 @@ module notes
 go 1.24
 
 require github.com/mattn/go-sqlite3 v1.14.24
+
+require github.com/google/uuid v1.6.0
diff --git a/go.sum b/go.sum
index 9dcdc9b..22c220f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,4 @@
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
 github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
diff --git a/main.go b/main.go
index 17866c1..e06a0bb 100644
--- a/main.go
+++ b/main.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -168,16 +169,22 @@ func handleNotes(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// Generate a new UUID for the note
+		note.ID = uuid.New().String()
+
 		_, err := db.Exec(`
-      INSERT INTO notes (id, title, content, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?)
-      `, note.ID, note.Title, note.Content, note.CreatedAt, note.UpdatedAt)
+			INSERT INTO notes (id, title, content, created_at, updated_at)
+			VALUES (?, ?, ?, ?, ?)
+			`, note.ID, note.Title, note.Content, note.CreatedAt, note.UpdatedAt)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
+		// Return the created note with the generated ID
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
+		json.NewEncoder(w).Encode(note)
 	}
 }