diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index f16aa055..f2663029 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -237,6 +237,10 @@ func (b *Bslack) handleSlack() {
 			if message.Raw.SubType == "me_message" {
 				msg.Event = config.EVENT_USER_ACTION
 			}
+			if message.Raw.SubType == "channel_leave" || message.Raw.SubType == "channel_join" {
+				msg.Username = "system"
+				msg.Event = config.EVENT_JOIN_LEAVE
+			}
 			b.Remote <- msg
 		}
 	}