diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx
index bcdd034..3bf20f0 100644
--- a/app/backend/InputOutputHandler.tsx
+++ b/app/backend/InputOutputHandler.tsx
@@ -317,20 +317,20 @@ const InputOutputBackend: React.FC = () => {
   }
 
   const handleResendClick = () => {
-    const msg = chatHistory.chats[chatHistory.selectedIndex].messages
-    const lastUserMessage = msg[msg.length-2].content
-    msg.splice(msg.length-2,2)
+    const temporary_message = messages[messages.length - 2]['content']
+    const updatedMessages = messages.slice(0, -2)
+    setMessages(updatedMessages)
     endGetWorker()
     getNewToken()
     setInputDisabled(false)
-    handleSendClick(lastUserMessage, true)
+    handleSendClick(temporary_message, true)
   }
 
   const handleEditClick = () => {
-    const msg = chatHistory.chats[chatHistory.selectedIndex].messages
-    const lastUserMessage = msg[msg.length-2].content
-    setInputMessage(lastUserMessage)
-    msg.splice(msg.length-2,2)
+    const newestMessage = messages[messages.length - 2].content
+    setInputMessage(newestMessage)
+    const updatedMessages = messages.slice(0, messages.length - 2)
+    setMessages(updatedMessages)
     endGetWorker()
     getNewToken()
     setInputDisabled(false)
diff --git a/app/components/History.tsx b/app/components/History.tsx
index ad8e9af..b0b23aa 100644
--- a/app/components/History.tsx
+++ b/app/components/History.tsx
@@ -46,7 +46,7 @@ const History: React.FC = () => {
     copyChats.chats = [...chatHistory.chats]
   
   // Remove the chat at the specified index
-    copyChats.chats.splice(index,1) 
+    copyChats.chats.splice(index,1)
 
   // Determine new selectedIndex
   let newSelectedIndex = currentIndex;