diff --git a/backend/src/main/java/com/alttd/altitudeweb/services/chat/ChatService.java b/backend/src/main/java/com/alttd/altitudeweb/services/chat/ChatService.java
index 6dcf0ad..a1ff43e 100644
--- a/backend/src/main/java/com/alttd/altitudeweb/services/chat/ChatService.java
+++ b/backend/src/main/java/com/alttd/altitudeweb/services/chat/ChatService.java
@@ -2,6 +2,7 @@ package com.alttd.altitudeweb.services.chat;
 
 import com.alttd.altitudeweb.controllers.chat.ChatMessage;
 import com.alttd.altitudeweb.controllers.chat.ChatMessageMapper;
+import com.alttd.altitudeweb.controllers.chat.ChatMessageType;
 import com.alttd.altitudeweb.database.Databases;
 import com.alttd.altitudeweb.database.chat.ChatLogMapper;
 import com.alttd.altitudeweb.model.PermissionClaimDto;
@@ -88,6 +89,8 @@ public class ChatService {
         String jsonMessageList = chatMessageList.stream()
                 .filter(ChatMessage::isNotBlocked)
                 .filter(chatMessage -> Arrays.asList(allowedServers).contains(chatMessage.getServer()))
+                //TODO [Stijn] [2026-07-19]: Handle different channel types
+                .filter(chatMessage -> chatMessage.getType() == ChatMessageType.PUBLIC)
                 .map(ChatMessageMapper::toJson)
                 .collect(Collectors.joining(",", "[", "]"));
 
diff --git a/frontend/src/app/pages/altitude/chat/objects/chat-message.object.ts b/frontend/src/app/pages/altitude/chat/objects/chat-message.object.ts
index 46c7f40..5c2d8d5 100644
--- a/frontend/src/app/pages/altitude/chat/objects/chat-message.object.ts
+++ b/frontend/src/app/pages/altitude/chat/objects/chat-message.object.ts
@@ -4,8 +4,9 @@ export interface ChatMessage {
   uuid: string;
   timestamp: number;
   server: string;
-  //TODO [Stijn] [2026-07-18]: Handle channel types
-  //channel: Channel;
+  type: string;
+  channel: string;
+  receiver: string;
   messageJson: MiniMessageComponent;
   notBlocked: boolean;
 }