diff --git a/projects/stream-chat-angular/src/lib/custom-templates.service.ts b/projects/stream-chat-angular/src/lib/custom-templates.service.ts
index 1cc46001..f0bfc639 100644
--- a/projects/stream-chat-angular/src/lib/custom-templates.service.ts
+++ b/projects/stream-chat-angular/src/lib/custom-templates.service.ts
@@ -292,9 +292,9 @@ export class CustomTemplatesService {
   newMessagesIndicatorTemplate$ = new BehaviorSubject<
     TemplateRef<void> | undefined
   >(undefined);
-  emptyChannelPlaceholder$ = new BehaviorSubject<TemplateRef<void> | undefined>(
-    undefined
-  );
+  emptyChannelPlaceholder$ = new BehaviorSubject<
+    TemplateRef<{ mode: 'main' | 'thread' }> | undefined
+  >(undefined);
 
   constructor() {}
 }
diff --git a/projects/stream-chat-angular/src/lib/message-list/message-list.component.html b/projects/stream-chat-angular/src/lib/message-list/message-list.component.html
index 2c0f740c..fc256d8d 100644
--- a/projects/stream-chat-angular/src/lib/message-list/message-list.component.html
+++ b/projects/stream-chat-angular/src/lib/message-list/message-list.component.html
@@ -35,7 +35,12 @@
         "
       ></stream-loading-indicator>
       <ng-container *ngIf="messages$ | async as messages">
-        <ng-container *ngIf="messages.length > 0; else noMessages">
+        <ng-container
+          *ngIf="
+            messages.length > 0 || !emptyChannelPlaceholderTemplate;
+            else noMessages
+          "
+        >
           <ng-container
             *ngFor="
               let message of messages;
@@ -111,7 +116,8 @@
         <ng-template #noMessages>
           <ng-container
             *ngTemplateOutlet="
-              emptyChannelPlaceholderTemplate || defaultTemplate
+              emptyChannelPlaceholderTemplate;
+              context: { mode: mode }
             "
           ></ng-container>
           <ng-template #defaultTemplate>
diff --git a/projects/stream-chat-angular/src/lib/message-list/message-list.component.ts b/projects/stream-chat-angular/src/lib/message-list/message-list.component.ts
index 5735d84b..a3bec173 100644
--- a/projects/stream-chat-angular/src/lib/message-list/message-list.component.ts
+++ b/projects/stream-chat-angular/src/lib/message-list/message-list.component.ts
@@ -87,7 +87,9 @@ export class MessageListComponent
   messageTemplate: TemplateRef<MessageContext> | undefined;
   customDateSeparatorTemplate: TemplateRef<DateSeparatorContext> | undefined;
   customnewMessagesIndicatorTemplate: TemplateRef<void> | undefined;
-  emptyChannelPlaceholderTemplate: TemplateRef<void> | undefined;
+  emptyChannelPlaceholderTemplate: TemplateRef<{
+    mode: 'main' | 'thread';
+  }> | null = null;
   messages$!: Observable<StreamMessage[]>;
   enabledMessageActions: string[] = [];
   @HostBinding('class') private class =
@@ -222,7 +224,7 @@ export class MessageListComponent
     );
     this.subscriptions.push(
       this.customTemplatesService.emptyChannelPlaceholder$.subscribe(
-        (template) => (this.emptyChannelPlaceholderTemplate = template)
+        (template) => (this.emptyChannelPlaceholderTemplate = template || null)
       )
     );
     this.usersTypingInChannel$ = this.channelService.usersTypingInChannel$;