diff --git a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/Actions/index.jsx b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/Actions/index.jsx
index 52ae1466a82ba0e82095a74318c1c3cd3aa74cd8..41fd7067b8a86999edeb4754292edbe00f700007 100644
--- a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/Actions/index.jsx
+++ b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/Actions/index.jsx
@@ -32,14 +32,13 @@ const Actions = ({
     <div className="flex w-full justify-between items-center">
       <div className="flex justify-start items-center gap-x-4">
         <CopyMessage message={message} />
-        {isLastMessage &&
-          !message?.includes("Workspace chat memory was reset!") && (
-            <RegenerateMessage
-              regenerateMessage={regenerateMessage}
-              slug={slug}
-              chatId={chatId}
-            />
-          )}
+        {isLastMessage && (
+          <RegenerateMessage
+            regenerateMessage={regenerateMessage}
+            slug={slug}
+            chatId={chatId}
+          />
+        )}
         {chatId && (
           <>
             <FeedbackButton
@@ -127,6 +126,7 @@ function CopyMessage({ message }) {
 }
 
 function RegenerateMessage({ regenerateMessage, chatId }) {
+  if (!chatId) return null;
   return (
     <div className="mt-3 relative">
       <button
diff --git a/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/SlashPresets/EditPresetModal.jsx b/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/SlashPresets/EditPresetModal.jsx
index fdffbe609c7f1bcbdf4ba4f84710c61e440fee78..4af3130a0021b217a31e2ac6baa66d6a5588f081 100644
--- a/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/SlashPresets/EditPresetModal.jsx
+++ b/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/SlashPresets/EditPresetModal.jsx
@@ -31,10 +31,7 @@ export default function EditPresetModal({
   };
 
   const handleDelete = async () => {
-    const confirmDelete = window.confirm(
-      "Are you sure you want to delete this preset?"
-    );
-    if (!confirmDelete) return;
+    if (!window.confirm("Are you sure you want to delete this preset?")) return;
 
     setDeleting(true);
     await onDelete(preset.id);