diff --git a/server/routes.go b/server/routes.go
index dc868038..b1def0de 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -429,6 +429,9 @@ func (s *Server) GenerateHandler(c *gin.Context) {
 				OpeningTag: openingTag,
 				ClosingTag: closingTag,
 			}
+			if strings.HasSuffix(strings.TrimSpace(prompt), openingTag) {
+				thinkingState.AddContent(openingTag)
+			}
 		}
 	}