diff --git a/internal/session/session.go b/internal/session/session.go
index d7c05710..972af4dc 100644
--- a/internal/session/session.go
+++ b/internal/session/session.go
@@ -84,7 +84,7 @@ func (session *SessionCtx) SetWebRTCConnected(connected bool) {
 
 func (session *SessionCtx) Disconnect(reason string) error {
 	if err := session.Send(
-		message.Disconnect{
+		message.SystemDisconnect{
 			Event:   event.SYSTEM_DISCONNECT,
 			Message: reason,
 		}); err != nil {
diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go
index 17cbe3aa..47217f45 100644
--- a/internal/types/message/messages.go
+++ b/internal/types/message/messages.go
@@ -23,7 +23,6 @@ type SystemAdmin struct {
 	BroadcastStatus BroadcastStatus  `json:"broadcast_status"`
 }
 
-// TODO: New.
 type SystemDisconnect struct {
 	Event   string `json:"event,omitempty"`
 	Message string `json:"message"`
@@ -139,11 +138,6 @@ type BroadcastStatus struct {
 	URL      string `json:"url,omitempty"`
 }
 
-// TODO: Remove.
-type Disconnect struct {
-	Event   string `json:"event"`
-	Message string `json:"message"`
-}
 
 // TODO: Remove.
 type MembersList struct {
diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go
index 14647c57..4272221e 100644
--- a/internal/websocket/manager.go
+++ b/internal/websocket/manager.go
@@ -124,10 +124,11 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e
 		ws.logger.Warn().Err(err).Msg("authentication failed")
 
 		// TODO: Refactor
-		if err = connection.WriteJSON(message.Disconnect{
-			Event:   event.SYSTEM_DISCONNECT,
-			Message: "authentication failed",
-		}); err != nil {
+		if err = connection.WriteJSON(
+			message.SystemDisconnect{
+				Event:   event.SYSTEM_DISCONNECT,
+				Message: "authentication failed",
+			}); err != nil {
 			ws.logger.Error().Err(err).Msg("failed to send disconnect")
 		}