diff --git a/pkg/bot/mattermost.go b/pkg/bot/mattermost.go
index 5ee8ccd4f6..0c21307e59 100644
--- a/pkg/bot/mattermost.go
+++ b/pkg/bot/mattermost.go
@@ -77,8 +77,7 @@ func NewMattermost(ctx context.Context, log logrus.FieldLogger, commGroupName st
 		return nil, err
 	}
 
-	mmURL := strings.TrimSuffix(cfg.URL, "/")
-
+	mmURL := strings.TrimSuffix(cfg.URL, "/") // This is needed for WS connection as `model.NewWebSocketClient4` already removes it
 	checkURL, err := url.Parse(mmURL)
 	if err != nil {
 		return nil, fmt.Errorf("while parsing Mattermost URL %q: %w", mmURL, err)
@@ -90,6 +89,11 @@ func NewMattermost(ctx context.Context, log logrus.FieldLogger, commGroupName st
 		webSocketURL = WebSocketSecureProtocol + checkURL.Host + checkURL.Path
 	}
 
+	log.WithFields(logrus.Fields{
+		"webSocketURL": webSocketURL,
+		"apiURL":       mmURL,
+	}).Debugf("Setting up Mattermost bot...")
+
 	client := model.NewAPIv4Client(mmURL)
 	client.SetOAuthToken(cfg.Token)
 	botTeams, _, err := client.SearchTeams(ctx, &model.TeamSearch{
@@ -100,7 +104,7 @@ func NewMattermost(ctx context.Context, log logrus.FieldLogger, commGroupName st
 	}
 
 	if len(botTeams) == 0 {
-		return nil, fmt.Errorf("team: %s not found", cfg.Team)
+		return nil, fmt.Errorf("team %q not found", cfg.Team)
 	}
 	botTeam := botTeams[0]
 	// In Mattermost v7.0+, what we see in MM Console is `display_name` of team.