diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 741275e83..1eace4b2d 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -54,11 +54,9 @@ export class AppShowPage {
     ),
   )
 
-  readonly currentMarketplace$: Observable<Marketplace> =
-    this.marketplaceService.getMarketplace()
+  readonly currentMarketplace$ = this.marketplaceService.getMarketplace()
 
-  readonly altMarketplaceData$: Observable<UIMarketplaceData> =
-    this.marketplaceService.getAltMarketplaceData()
+  readonly altMarketplaceData$ = this.marketplaceService.getAltMarketplaceData()
 
   constructor(
     private readonly route: ActivatedRoute,
diff --git a/frontend/projects/ui/src/app/services/marketplace.service.ts b/frontend/projects/ui/src/app/services/marketplace.service.ts
index 5b199989e..bab591ea8 100644
--- a/frontend/projects/ui/src/app/services/marketplace.service.ts
+++ b/frontend/projects/ui/src/app/services/marketplace.service.ts
@@ -34,11 +34,11 @@ export class MarketplaceService extends AbstractMarketplaceService {
   private readonly notes = new Map<string, Record<string, string>>()
   private readonly hasPackages$ = new Subject<boolean>()
 
-  private readonly uiMarketplaceData$: Observable<UIMarketplaceData> =
-    this.patch.watch$('ui', 'marketplace').pipe(
-      filter(Boolean),
+  private readonly uiMarketplaceData$ = this.patch
+    .watch$('ui', 'marketplace')
+    .pipe(
       distinctUntilChanged(
-        (prev, curr) => prev['selected-id'] === curr['selected-id'],
+        (prev, curr) => prev?.['selected-id'] === curr?.['selected-id'],
       ),
       shareReplay(1),
     )
@@ -133,7 +133,7 @@ export class MarketplaceService extends AbstractMarketplaceService {
     return this.marketplace$
   }
 
-  getAltMarketplaceData(): Observable<UIMarketplaceData> {
+  getAltMarketplaceData() {
     return this.uiMarketplaceData$
   }