diff --git a/web/src/hooks/useMessageActions.js b/web/src/hooks/useMessageActions.js
index 8de65fa7..d67618ce 100644
--- a/web/src/hooks/useMessageActions.js
+++ b/web/src/hooks/useMessageActions.js
@@ -100,7 +100,7 @@ export const useMessageActions = (message, setMessage, onMessageSend, saveMessag
         }, 100);
 
         return newMessages;
-      } else if (targetMessage.role === 'assistant') {
+      } else if (targetMessage.role === 'assistant' || targetMessage.role === 'system') {
         let userMessageIndex = messageIndex - 1;
         while (userMessageIndex >= 0 && prevMessages[userMessageIndex].role !== 'user') {
           userMessageIndex--;