diff --git a/apps/wireframe-renderer-web/src/pages/canvas.tsx b/apps/wireframe-renderer-web/src/pages/canvas.tsx
index 73355ad..a75c7bb 100644
--- a/apps/wireframe-renderer-web/src/pages/canvas.tsx
+++ b/apps/wireframe-renderer-web/src/pages/canvas.tsx
@@ -230,11 +230,15 @@ export default function CanvasPage() {
       if (userProjects && userProjects.length > 0) {
         setProjects(userProjects);
         // Use specified project or first one
-        let project: Project | undefined;
+        let project: Project;
         if (projectIdFromUrl) {
-          project = userProjects.find((p: Project) => p.id === parseInt(projectIdFromUrl));
-        }
-        if (!project) {
+          const found = userProjects.find((p: Project) => p.id === parseInt(projectIdFromUrl));
+          if (found) {
+            project = found;
+          } else {
+            project = userProjects[0];
+          }
+        } else {
           project = userProjects[0];
         }
         setCurrentProject(project);