diff --git a/src/app/player/components/channel-list-container/channel-list-container.component.html b/src/app/player/components/channel-list-container/channel-list-container.component.html
index 23ba8e5a9..8e9ad77a8 100644
--- a/src/app/player/components/channel-list-container/channel-list-container.component.html
+++ b/src/app/player/components/channel-list-container/channel-list-container.component.html
@@ -17,25 +17,30 @@
                 />
             </div>
             <mat-divider></mat-divider>
-            <mat-nav-list>
-                <app-channel-list-item
-                    *rxFor="
-                        let channel of _channelList
-                            | filterBy: searchTerm.name : 'name';
-                        index as i;
-                        trackBy: trackByFn
-                    "
-                    [name]="
-                        i +
-                        1 +
-                        '. ' +
-                        (channel?.name || 'CHANNELS.UNNAMED_CHANNEL'
-                            | translate)
-                    "
-                    [logo]="channel?.tvg?.logo"
-                    (clicked)="selectChannel(channel)"
-                    [selected]="selected?.id === channel?.id"
-                ></app-channel-list-item>
+            <mat-nav-list style="overflow: hidden">
+                <cdk-virtual-scroll-viewport
+                    itemSize="50"
+                    class="scroll-viewport"
+                >
+                    <app-channel-list-item
+                        *cdkVirtualFor="
+                            let channel of _channelList
+                                | filterBy: searchTerm.name : 'name';
+                            index as i;
+                            trackBy: trackByFn
+                        "
+                        [name]="
+                            i +
+                            1 +
+                            '. ' +
+                            (channel?.name || 'CHANNELS.UNNAMED_CHANNEL'
+                                | translate)
+                        "
+                        [logo]="channel?.tvg?.logo"
+                        (clicked)="selectChannel(channel)"
+                        [selected]="selected?.id === channel?.id"
+                    ></app-channel-list-item>
+                </cdk-virtual-scroll-viewport>
             </mat-nav-list>
         </mat-tab>
 
diff --git a/src/app/player/components/channel-list-container/channel-list-container.component.scss b/src/app/player/components/channel-list-container/channel-list-container.component.scss
index 88b68eb64..825f6a573 100644
--- a/src/app/player/components/channel-list-container/channel-list-container.component.scss
+++ b/src/app/player/components/channel-list-container/channel-list-container.component.scss
@@ -3,7 +3,7 @@
 }
 
 .scroll-viewport {
-    min-height: calc(100vh - 165px);
+    min-height: calc(100vh - 185px);
 }
 
 .search-panel {
diff --git a/src/app/player/components/channel-list-container/channel-list-container.component.ts b/src/app/player/components/channel-list-container/channel-list-container.component.ts
index 41c646d10..6124b7fc1 100644
--- a/src/app/player/components/channel-list-container/channel-list-container.component.ts
+++ b/src/app/player/components/channel-list-container/channel-list-container.component.ts
@@ -1,4 +1,5 @@
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 import { CommonModule, TitleCasePipe } from '@angular/common';
 import {
     Component,
@@ -16,7 +17,6 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { Store } from '@ngrx/store';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { RxFor } from '@rx-angular/template/for';
 import * as _ from 'lodash';
 import { map, skipWhile } from 'rxjs';
 import { Channel } from '../../../../../shared/channel.interface';
@@ -27,6 +27,7 @@ import {
     selectFavorites,
 } from '../../../state/selectors';
 import { ChannelListItemComponent } from './channel-list-item/channel-list-item.component';
+
 @Component({
     standalone: true,
     selector: 'app-channel-list-container',
@@ -44,7 +45,7 @@ import { ChannelListItemComponent } from './channel-list-item/channel-list-item.
         TitleCasePipe,
         FilterPipe,
         FormsModule,
-        RxFor,
+        ScrollingModule,
     ],
 })
 export class ChannelListContainerComponent {
@@ -138,11 +139,6 @@ export class ChannelListContainerComponent {
         this.store.dispatch(PlaylistActions.updateFavorites({ channel }));
     }
 
-    /**
-     * Required for change detection mechanism to nor re-init the whole component after changes
-     * @param index index of the channel item
-     * @param channel channel object
-     */
     trackByFn(_: number, channel: Channel): string {
         return channel?.id;
     }
diff --git a/src/styles.scss b/src/styles.scss
index 0399646c5..dd3fec053 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -96,7 +96,7 @@ textarea,
     }
 
     .scroll-viewport {
-        min-height: calc(100vh - 200px) !important;
+        min-height: calc(100vh - 210px) !important;
     }
 }