diff --git a/frontend/src/pages/Chat.tsx b/frontend/src/pages/Chat.tsx
index c37e54f..2a894b7 100644
--- a/frontend/src/pages/Chat.tsx
+++ b/frontend/src/pages/Chat.tsx
@@ -599,14 +599,15 @@ const ChatPanel: FC = observer(() => {
           if (data.model)
             commonStore.setLastModelName(data.model);
           if (data.choices && Array.isArray(data.choices) && data.choices.length > 0) {
-            if (data.choices[0]?.finish_reason) {
-              finish();
-              return;
-            }
             answer += data.choices[0]?.delta?.content || '';
             commonStore.conversation[answerId!].content = answer;
             commonStore.setConversation(commonStore.conversation);
             commonStore.setConversationOrder([...commonStore.conversationOrder]);
+
+            if (data.choices[0]?.finish_reason) {
+              finish();
+              return;
+            }
           }
         },
         async onopen(response) {
diff --git a/frontend/src/pages/Completion.tsx b/frontend/src/pages/Completion.tsx
index 1c54be2..366018c 100644
--- a/frontend/src/pages/Completion.tsx
+++ b/frontend/src/pages/Completion.tsx
@@ -125,12 +125,13 @@ const CompletionPanel: FC = observer(() => {
           if (data.model)
             commonStore.setLastModelName(data.model);
           if (data.choices && Array.isArray(data.choices) && data.choices.length > 0) {
+            answer += data.choices[0]?.text || data.choices[0]?.delta?.content || '';
+            setPrompt(prompt + answer.replace(/\s+$/, '') + params.injectEnd.replaceAll('\\n', '\n'));
+
             if (data.choices[0]?.finish_reason) {
               finish();
               return;
             }
-            answer += data.choices[0]?.text || data.choices[0]?.delta?.content || '';
-            setPrompt(prompt + answer.replace(/\s+$/, '') + params.injectEnd.replaceAll('\\n', '\n'));
           }
         },
         async onopen(response) {
diff --git a/frontend/src/pages/Composition.tsx b/frontend/src/pages/Composition.tsx
index 99ab0c3..d553545 100644
--- a/frontend/src/pages/Composition.tsx
+++ b/frontend/src/pages/Composition.tsx
@@ -230,12 +230,13 @@ const CompositionPanel: FC = observer(() => {
           if (data.model)
             commonStore.setLastModelName(data.model);
           if (data.choices && Array.isArray(data.choices) && data.choices.length > 0) {
+            answer += data.choices[0]?.text || data.choices[0]?.delta?.content || '';
+            setPrompt(prompt + answer.replace(/\s+$/, ''));
+
             if (data.choices[0]?.finish_reason) {
               finish();
               return;
             }
-            answer += data.choices[0]?.text || data.choices[0]?.delta?.content || '';
-            setPrompt(prompt + answer.replace(/\s+$/, ''));
           }
         },
         async onopen(response) {