diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go
index 8474025f2..ca3410618 100644
--- a/server/channelserver/handlers_cast_binary.go
+++ b/server/channelserver/handlers_cast_binary.go
@@ -22,10 +22,10 @@ const (
 
 // MSG_SYS_CAST[ED]_BINARY broadcast types enum
 const (
-	BroadcastTypeTargeted  = 0x01
-	BroadcastTypeStage     = 0x03
-	BroadcastTypeSemaphore = 0x06
-	BroadcastTypeWorld     = 0x0a
+	BroadcastTypeTargeted = 0x01
+	BroadcastTypeStage    = 0x03
+	BroadcastTypeServer   = 0x06
+	BroadcastTypeWorld    = 0x0a
 )
 
 func sendServerChatMessage(s *Session, message string) {
@@ -125,7 +125,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 		} else {
 			s.stage.BroadcastMHF(resp, s)
 		}
-	case BroadcastTypeSemaphore:
+	case BroadcastTypeServer:
 		if pkt.MessageType == 1 {
 			raviSema := getRaviSemaphore(s)
 			if raviSema != "" {
@@ -133,11 +133,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 				(*sema).BroadcastMHF(resp, s)
 			}
 		} else {
-			s.Lock()
-			if s.stage != nil {
-				s.stage.BroadcastMHF(resp, s)
-			}
-			s.Unlock()
+			s.server.BroadcastMHF(resp, s)
 		}
 	case BroadcastTypeTargeted:
 		for _, targetID := range (*msgBinTargeted).TargetCharIDs {
diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go
index 0dd682fd2..62c4b2ad7 100644
--- a/server/channelserver/sys_channel_server.go
+++ b/server/channelserver/sys_channel_server.go
@@ -355,7 +355,7 @@ func (s *Server) BroadcastRaviente(ip uint32, port uint16, stage []byte, _type u
 	bf.WriteBytes(make([]byte, 17))
 	s.WorldcastMHF(&mhfpacket.MsgSysCastedBinary{
 		CharID:         0x00000000,
-		BroadcastType:  BroadcastTypeSemaphore,
+		BroadcastType:  BroadcastTypeServer,
 		MessageType:    BinaryMessageTypeChat,
 		RawDataPayload: bf.Data(),
 	}, nil)