diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ToolWindowCompletionResponseEventListener.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ToolWindowCompletionResponseEventListener.java
index 981e939a..606c7686 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ToolWindowCompletionResponseEventListener.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ToolWindowCompletionResponseEventListener.java
@@ -29,7 +29,7 @@ abstract class ToolWindowCompletionResponseEventListener implements
 
   private static final Logger LOG = Logger.getInstance(
       ToolWindowCompletionResponseEventListener.class);
-  private static final int UPDATE_INTERVAL_MS = 8;
+  private static final int UPDATE_INTERVAL_MS = 20;
 
   private final Project project;
   private final StringBuilder messageBuilder = new StringBuilder();
@@ -73,7 +73,7 @@ abstract class ToolWindowCompletionResponseEventListener implements
 
     try {
       messageBuilder.append(partialMessage);
-      var ongoingTokens = encodingManager.countTokens(messageBuilder.toString());
+      var ongoingTokens = encodingManager.countTokens(partialMessage);
       messageBuffer.offer(partialMessage);
       ApplicationManager.getApplication().invokeLater(() ->
           totalTokensPanel.update(totalTokensPanel.getTokenDetails().getTotal() + ongoingTokens)
@@ -163,6 +163,7 @@ abstract class ToolWindowCompletionResponseEventListener implements
     responsePanel.enableAllActions(true);
     responseContainer.stopLoading();
     responseContainer.hideCaret();
+    responseContainer.finishThinking();
     CompletionProgressNotifier.update(project, false);
   }
 }
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ChatMessageResponseBody.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ChatMessageResponseBody.java
index 1ef95f62..0f1dc66b 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ChatMessageResponseBody.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ChatMessageResponseBody.java
@@ -229,6 +229,15 @@ public class ChatMessageResponseBody extends JPanel {
     }
   }
 
+  public void finishThinking() {
+    ApplicationManager.getApplication().invokeLater(() -> {
+      var thoughtProcessPanel = getExistingThoughtProcessPanel();
+      if (thoughtProcessPanel != null && !thoughtProcessPanel.isFinished()) {
+        thoughtProcessPanel.setFinished();
+      }
+    });
+  }
+
   public void clear() {
     contentPanel.removeAll();
     streamOutputParser.clear();
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/completions/factory/OpenAIRequestFactory.kt b/src/main/kotlin/ee/carlrobert/codegpt/completions/factory/OpenAIRequestFactory.kt
index 56e3ea7d..9dd34bb8 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/completions/factory/OpenAIRequestFactory.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/completions/factory/OpenAIRequestFactory.kt
@@ -153,7 +153,7 @@ class OpenAIRequestFactory : BaseRequestFactory() {
                 val r = m.response?.trim().orEmpty()
                 if (r.isNotEmpty()) messages.add(OpenAIChatCompletionStandardMessage("assistant", r))
             }
-            messages.add(OpenAIChatCompletionStandardMessage("user", "Generate SEARCH and REPLACE blocks."))
+            messages.add(OpenAIChatCompletionStandardMessage("user", "Implement."))
             return messages
         }
 
@@ -317,15 +317,8 @@ class OpenAIRequestFactory : BaseRequestFactory() {
                     messages.add(OpenAIChatCompletionStandardMessage("user", prevMessage.prompt))
                 }
 
-                var response = prevMessage.response ?: ""
-                if (response.startsWith("<think>")) {
-                    response = response
-                        .replace("(?s)<think>.*?</think>".toRegex(), "")
-                        .trim { it <= ' ' }
-                }
-
                 messages.add(
-                    OpenAIChatCompletionStandardMessage("assistant", response)
+                    OpenAIChatCompletionStandardMessage("assistant", prevMessage.response ?: "")
                 )
             }
 
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceSettings.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceSettings.kt
index 0a11362a..ecb293a7 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceSettings.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceSettings.kt
@@ -121,7 +121,7 @@ class CustomServicesSettings :
         val modelSelection = service<ModelSelectionService>()
         val featureSelection = modelSelection.getModelSelectionForFeature(featureType)
 
-        if (featureSelection.provider != ServiceType.CUSTOM_OPENAI)
+        if (featureSelection?.provider != ServiceType.CUSTOM_OPENAI)
             throw IllegalStateException(
                 "Current selected ServiceType (${featureSelection}) is not of type 'CUSTOM_OPENAI'. " +
                         "This function should not be called in this context!"
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/parser/SseMessageParser.kt b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/parser/SseMessageParser.kt
index 517f2b06..78ed7157 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/parser/SseMessageParser.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/parser/SseMessageParser.kt
@@ -236,17 +236,24 @@ class SseMessageParser : MessageParser {
         segments: MutableList<Segment>,
         state: ParserState.InThinking
     ): Boolean {
-        val thinkEndIdx = buffer.indexOf(THINK_END)
+        val currentBuffer = buffer.toString()
+        val combined = state.content + currentBuffer
+        val endIdxCombined = combined.indexOf(THINK_END)
 
-        return if (thinkEndIdx >= 0) {
-            val thinkingContent = state.content + buffer.substring(0, thinkEndIdx)
+        return if (endIdxCombined >= 0) {
+            val thinkingContent = combined.substring(0, endIdxCombined)
             segments.add(Thinking(thinkingContent))
-            consumeFromBuffer(thinkEndIdx + THINK_END.length)
+
+            val consumedFromBuffer = (endIdxCombined + THINK_END.length - state.content.length)
+                .coerceAtLeast(0)
+                .coerceAtMost(currentBuffer.length)
+            consumeFromBuffer(consumedFromBuffer)
+
             parserState = ParserState.Outside
             true
         } else {
             if (buffer.isNotEmpty()) {
-                val newContent = state.content + buffer.toString()
+                val newContent = state.content + currentBuffer
                 segments.add(Thinking(newContent))
                 buffer.clear()
                 parserState = ParserState.InThinking(newContent)