diff --git a/src/components/HistorySidebar/index.tsx b/src/components/HistorySidebar/index.tsx
index e4faa1eea..12444b68d 100644
--- a/src/components/HistorySidebar/index.tsx
+++ b/src/components/HistorySidebar/index.tsx
@@ -518,7 +518,7 @@ export default function HistorySidebar() {
 													return (
 														<div
 															onClick={() => {
-																handleSetActive(task.task_id, task.question, task.id);
+																handleSetActive(task.task_id, task.question || "", task.id);
 															}}
 															key={task.task_id}
 															className={`${
diff --git a/src/components/SearchHistoryDialog.tsx b/src/components/SearchHistoryDialog.tsx
index 589de96fd..e7adbf25c 100644
--- a/src/components/SearchHistoryDialog.tsx
+++ b/src/components/SearchHistoryDialog.tsx
@@ -100,14 +100,14 @@ export function SearchHistoryDialog() {
 								key={task.id}
 								className="cursor-pointer"
 								/**
-								 * TODO(history): Update to use project_id field 
+								 * TODO(history): Update to use project_id field
 								 * after update instead.
 								 */
-								onSelect={() => handleSetActive(task.task_id, task.question, task.id)}
+								onSelect={() => handleSetActive(task.task_id, task.question || "", task.id)}
 							>
 								<ScanFace />
 								<div className="overflow-hidden text-ellipsis whitespace-nowrap">
-									{task.question}
+									{task.question || ""}
 								</div>
 							</CommandItem>
 						))}
diff --git a/src/pages/Dashboard/Project.tsx b/src/pages/Dashboard/Project.tsx
index 6a3434665..160ffce41 100644
--- a/src/pages/Dashboard/Project.tsx
+++ b/src/pages/Dashboard/Project.tsx
@@ -536,7 +536,7 @@ export default function Project() {
             {historyTasks.map((task) => {
               return (
                 <div
-                  onClick={() => handleSetActive(task.task_id, task.question)}
+                  onClick={() => handleSetActive(task.task_id, task.question || "")}
                   key={task.task_id}
                   className={`${
                     chatStore.activeTaskId === task.task_id
@@ -578,7 +578,7 @@ export default function Project() {
               return (
                 <div
                   onClick={() => {
-                    handleSetActive(task.task_id, task.question);
+                    handleSetActive(task.task_id, task.question || "");
                   }}
                   key={task.task_id}
                   className={`${