diff --git a/libs/portal/stalker/feature/src/lib/stalker-workspace-route-session.service.ts b/libs/portal/stalker/feature/src/lib/stalker-workspace-route-session.service.ts
index f65ec9104..9601c70ee 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-workspace-route-session.service.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-workspace-route-session.service.ts
@@ -11,11 +11,12 @@ import { NavigationEnd, Router } from '@angular/router';
 import { filter, firstValueFrom } from 'rxjs';
 import { PlaylistContextFacade } from '@iptvnator/playlist/shared/util';
 import { PortalRailSection } from '@iptvnator/portal/shared/util';
-import { StalkerStore } from '@iptvnator/portal/stalker/data-access';
+import {
+    StalkerContentType,
+    StalkerStore,
+} from '@iptvnator/portal/stalker/data-access';
 import { PlaylistsService } from 'services';
 
-type StalkerContentType = 'vod' | 'series' | 'itv' | 'radio';
-
 @Injectable()
 export class StalkerWorkspaceRouteSession {
     private readonly destroyRef = inject(DestroyRef);
diff --git a/libs/ui/playback/src/lib/audio-player/audio-player.component.ts b/libs/ui/playback/src/lib/audio-player/audio-player.component.ts
index 32f03e522..2945fc54d 100644
--- a/libs/ui/playback/src/lib/audio-player/audio-player.component.ts
+++ b/libs/ui/playback/src/lib/audio-player/audio-player.component.ts
@@ -241,12 +241,12 @@ export class AudioPlayerComponent {
     }
 
     switchChannel(direction: 'next' | 'previous') {
-        this.channelSwitchRequested.emit(direction);
-
         if (this.dispatchAdjacentChannelAction()) {
             this.store.dispatch(
                 ChannelActions.setAdjacentChannelAsActive({ direction })
             );
+        } else {
+            this.channelSwitchRequested.emit(direction);
         }
     }
 }