diff --git a/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/target.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/target.component.ts
index b5cb932b7..4506716de 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/target.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/target.component.ts
@@ -47,7 +47,6 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
                 [type]="context.data.type"
                 [target]="target"
                 [serverId]="serverId"
-                ]
               />
               <div [style.color]="'var(--tui-text-secondary'">
                 {{ displayInfo.description }}
@@ -77,7 +76,7 @@ export class BackupsTargetModal {
   private readonly dialogs = inject(TuiDialogService)
   private readonly errorService = inject(ErrorService)
   private readonly api = inject(ApiService)
-  private readonly patch = inject(PatchDB<DataModel>)
+  private readonly patch = inject<PatchDB<DataModel>>(PatchDB)
 
   readonly context =
     inject<TuiDialogContext<BackupTarget, { type: BackupType }>>(
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/metrics/metrics.service.ts b/web/projects/ui/src/app/routes/portal/routes/system/metrics/metrics.service.ts
index 6ff818bef..1eb66d06f 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/metrics/metrics.service.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/metrics/metrics.service.ts
@@ -25,7 +25,7 @@ export class MetricsService extends Observable<ServerMetrics> {
     ),
     // @TODO Alex how to handle failure and reconnection here? Simple retry() will not work. Seems like we need a general solution for reconnecting websockets: patchDB, logs, metrics, progress, and any future. Reconnection should depend on server state, then we need to get a new guid, then reconnect. Similar to how patchDB websocket currently behaves on disconnect/reconnect.
     retry(),
-    shareReplay(),
+    shareReplay(1),
   )
 
   constructor() {
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 9b1301148..20cce6d40 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -38,7 +38,7 @@ export class DepErrorService {
           ),
       ),
       distinctUntilChanged(deepEqual),
-      shareReplay({ bufferSize: 1, refCount: true }),
+      shareReplay(1),
     )
 
   constructor(
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 21c7ee09f..f4d11f475 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -76,7 +76,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
       map(({ selectedUrl: url, knownHosts: hosts }) =>
         toStoreIdentity(url, hosts[url]),
       ),
-      shareReplay({ bufferSize: 1, refCount: true }),
+      shareReplay(1),
     )
 
   private readonly marketplace$ = this.knownHosts$.pipe(
@@ -102,7 +102,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
       },
       {},
     ),
-    shareReplay({ bufferSize: 1, refCount: true }),
+    shareReplay(1),
   )
 
   private readonly filteredMarketplace$ = combineLatest([