diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index 32e9b8d30..23a0033aa 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -171,6 +171,7 @@ export const polls = router({
               },
               create: {
                 id: ctx.user.id,
+                isGuest: true,
               },
             },
           },
diff --git a/apps/web/src/trpc/routers/polls/comments.ts b/apps/web/src/trpc/routers/polls/comments.ts
index 241327790..3a2953d5c 100644
--- a/apps/web/src/trpc/routers/polls/comments.ts
+++ b/apps/web/src/trpc/routers/polls/comments.ts
@@ -39,9 +39,23 @@ export const comments = router({
       const newComment = await prisma.comment.create({
         data: {
           content,
-          pollId,
           authorName,
-          userId: ctx.user.id,
+          poll: {
+            connect: {
+              id: pollId,
+            },
+          },
+          user: {
+            connectOrCreate: {
+              where: {
+                id: ctx.user.id,
+              },
+              create: {
+                id: ctx.user.id,
+                isGuest: true,
+              },
+            },
+          },
         },
         select: {
           id: true,