diff --git a/assistant.go b/assistant.go
index 3e115b0..a7f9430 100644
--- a/assistant.go
+++ b/assistant.go
@@ -31,12 +31,6 @@ func matchAssistantConversation(botUsr *tele.User, msg *tele.Message) []*tele.Me
 	}
 
 	for _, msg := range thread {
-		for _, ent := range msg.Entities {
-			if ent.Type == tele.EntityCommand {
-				return nil
-			}
-		}
-
 		from := msg.Sender
 		chat := msg.Chat
 		if from == nil || chat == nil {
@@ -90,22 +84,12 @@ func matchAssistantConversation(botUsr *tele.User, msg *tele.Message) []*tele.Me
 type assistantStreamedResponseCb func(text string, finished bool) (*tele.Message, error)
 
 func assistantStreamedResponse(request openai.ChatRequest, cb assistantStreamedResponseCb) error {
-	logger.Debugw("Openai chat request", "req", request)
+	logger.Debugf("Openai chat request: %#+v", request)
 	ai := openai.NewClient(config.OpenAIApiKey)
 
-	var (
-		resp *openai.ChatResponseStream
-		err  error
-	)
-	tries := 2
-	for {
-		if tries--; tries < 0 {
-			return err
-		}
-		if resp, err = ai.ChatCompletionStream(request); err == nil {
-			break
-		}
-		logger.Warnw("assistant: failed to get response", "error", err)
+	resp, err := ai.ChatCompletionStream(request)
+	if err != nil {
+		return err
 	}
 
 	nErrs := 0
@@ -204,7 +188,7 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
 		role := openai.ChatRoleUser
 		from := thread[l].Sender
 		if from != nil && from.ID == me.ID {
-			role = openai.ChatRoleAssistant
+			role = openai.ChatRoleSystem
 		}
 
 		convMsgs = append(convMsgs, openai.ChatMessage{
@@ -237,12 +221,11 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
 		var err error
 		if replyMsg == nil {
 			<-typingNotifyCh
-			replyMsg, err = c.Bot().Reply(lastMsg, text, tele.Silent)
+			replyMsg, err = c.Bot().Reply(c.Message(), text, tele.Silent)
 		} else {
 			replyMsg, err = c.Bot().Edit(replyMsg, text)
 		}
 		if finished && err == nil {
-			replyMsg.ReplyTo = lastMsg // nasty bug
 			if err := cacheMessage(replyMsg); err != nil {
 				logger.Warnw("failed to cache message", "error", err)
 			}
@@ -252,9 +235,8 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
 
 	if reqErr != nil {
 		logger.Errorw("assistant: failed to complete conversation", "error", reqErr)
-		return c.Reply("Sorry, there's a technical issue. 😵💫 Please try again later.", tele.Silent)
 	}
-	return nil
+	return reqErr
 }
 
 func assistantRemoveMention(msg, name string) string {