diff --git a/server/.golangci.yml b/server/.golangci.yml
index a2fe565ada1..0b002de8126 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -135,7 +135,6 @@ issues:
         channels/app/slashcommands/auto_environment.go|\
         channels/app/slashcommands/command_test.go|\
         channels/app/slashcommands/helper_test.go|\
-        channels/app/status.go|\
         channels/app/status_test.go|\
         channels/app/support_packet_test.go|\
         channels/app/team.go|\
diff --git a/server/channels/app/status.go b/server/channels/app/status.go
index 163d43bee11..8484597a5dd 100644
--- a/server/channels/app/status.go
+++ b/server/channels/app/status.go
@@ -98,13 +98,15 @@ func (a *App) SetCustomStatus(c request.CTX, userID string, cs *model.CustomStat
 		return err
 	}
 
-	user.SetCustomStatus(cs)
+	if err := user.SetCustomStatus(cs); err != nil {
+		c.Logger().Error("Failed to set custom status", mlog.String("userID", userID), mlog.Err(err))
+	}
 	_, updateErr := a.UpdateUser(c, user, true)
 	if updateErr != nil {
 		return updateErr
 	}
 
-	if err := a.addRecentCustomStatus(c, userID, cs); err != nil {
+	if err = a.addRecentCustomStatus(c, userID, cs); err != nil {
 		c.Logger().Error("Can't add recent custom status for", mlog.String("userID", userID), mlog.Err(err))
 	}