diff --git a/main.go b/main.go
index 5e1bbc8..1004cc2 100644
--- a/main.go
+++ b/main.go
@@ -82,8 +82,6 @@ func run() {
 		chatID := update.Message.Chat.ID
 		username := update.Message.From.UserName
 
-		_ = db.AddUserInChat(chatID, username)
-
 		if strings.Contains(strings.ToLower(text), tag) {
 			_, _ = bot.Send(tgbot.NewMessage(chatID, allUsers))
 		}
@@ -98,5 +96,7 @@ func run() {
 		case commands.Ping:
 			_, _ = bot.Send(tgbot.NewMessage(chatID, "pong"))
 		}
+
+		_ = db.AddUserInChat(chatID, username)
 	}
 }