diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5f30033..37157e4 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -386,7 +386,7 @@ export default function Home() {
                                     <span className={priorityColors[task.priority]}>
                                       {task.priority}
                                     </span>
-                                    {task.comments.length > 0 && (
+                                    {task.comments && task.comments.length > 0 && (
                                       <span className="flex items-center gap-1 text-slate-500">
                                         <MessageSquare className="w-3 h-3" />
                                         {task.comments.length}
@@ -633,12 +633,12 @@ export default function Home() {
                 <div className="border-t border-slate-800 pt-6">
                   <h4 className="font-medium text-white mb-4 flex items-center gap-2">
                     <MessageSquare className="w-4 h-4" />
-                    Notes & Comments ({editedTask.comments.length})
+                    Notes & Comments ({editedTask.comments?.length || 0})
                   </h4>
 
                   {/* Comment List */}
                   <div className="space-y-4 mb-4">
-                    {editedTask.comments.length === 0 ? (
+                    {!editedTask.comments || editedTask.comments.length === 0 ? (
                       <p className="text-slate-500 text-sm">No notes yet. Add the first one!</p>
                     ) : (
                       editedTask.comments.map((comment) => (
diff --git a/src/components/SprintBoard.tsx b/src/components/SprintBoard.tsx
index 2d3569a..4ea9437 100644
--- a/src/components/SprintBoard.tsx
+++ b/src/components/SprintBoard.tsx
@@ -101,7 +101,7 @@ function SortableTaskCard({
               <Badge variant="outline" className="text-xs border-slate-600 text-slate-400">
                 {task.type}
               </Badge>
-              {task.comments.length > 0 && (
+              {task.comments && task.comments.length > 0 && (
                 <span className="text-xs text-slate-500">
                   💬 {task.comments.length}
                 </span>