diff --git a/app/channel.go b/app/channel.go
index bd9acaa6d3..84be8557b6 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -1041,7 +1041,7 @@ func SetActiveChannel(userId string, channelId string) *model.AppError {
 	} else {
 		oldStatus = status.Status
 		status.ActiveChannel = channelId
-		if !status.Manual {
+		if !status.Manual && channelId != "" {
 			status.Status = model.STATUS_ONLINE
 		}
 		status.LastActivityAt = model.GetMillis()