diff --git a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
index bd36f8ece..9639af3b8 100644
--- a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
+++ b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
@@ -4,6 +4,7 @@ import {
 } from '@angular/cdk/scrolling';
 import {
     AfterViewInit,
+    ChangeDetectionStrategy,
     ChangeDetectorRef,
     Component,
     computed,
@@ -55,6 +56,7 @@ interface XtreamCategoryLike {
     selector: 'app-portal-channels-list',
     templateUrl: './portal-channels-list.component.html',
     styleUrls: ['./portal-channels-list.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
     imports: [
         ChannelListItemComponent,
         MatIcon,
diff --git a/libs/ui/epg/src/lib/epg-list/epg-list.component.html b/libs/ui/epg/src/lib/epg-list/epg-list.component.html
index c076bddbe..caf290ece 100644
--- a/libs/ui/epg/src/lib/epg-list/epg-list.component.html
+++ b/libs/ui/epg/src/lib/epg-list/epg-list.component.html
@@ -35,7 +35,7 @@
     <!-- program list -->
     <div id="program-list" class="app-scrollbar" #programList>
         @if (items.length > 0) {
-            @for (program of items; track $index) {
+            @for (program of items; track program.start) {
                 @if (!canActivateProgram(program)) {
                     <div
                         class="program-item"
@@ -105,8 +105,14 @@
                 }
             }
         } @else {
-            <div class="epg-not-available">
-                {{ 'EPG.EPG_NOT_AVAILABLE_DATE' | translate }}
+            <div class="epg-empty-state">
+                <mat-icon class="empty-state-icon">event_busy</mat-icon>
+                <div class="empty-state-title">
+                    {{ 'EPG.EPG_NOT_AVAILABLE_DATE' | translate }}
+                </div>
+                <div class="empty-state-hint">
+                    {{ 'EPG.NO_GUIDE_HINT' | translate }}
+                </div>
             </div>
         }
     </div>
diff --git a/libs/ui/epg/src/lib/multi-epg/multi-epg-container.component.html b/libs/ui/epg/src/lib/multi-epg/multi-epg-container.component.html
index bfb94454c..06ecb3ca9 100644
--- a/libs/ui/epg/src/lib/multi-epg/multi-epg-container.component.html
+++ b/libs/ui/epg/src/lib/multi-epg/multi-epg-container.component.html
@@ -83,7 +83,7 @@
       </div>
       @if (programSearchResults().length > 0) {
         <div class="program-search-results">
-          @for (program of programSearchResults(); track $index) {
+          @for (program of programSearchResults(); track program.start) {
             <button class="search-result-item" (click)="showProgramDetails(program)">
               <div class="result-info">
                 <span class="result-title">{{ program.title }}</span>