diff --git a/ui-ngx/src/app/modules/home/models/widget-component.models.ts b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
index 465cade9f2..8230fe5487 100644
--- a/ui-ngx/src/app/modules/home/models/widget-component.models.ts
+++ b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
@@ -50,7 +50,6 @@ import { WidgetTypeId } from '@shared/models/id/widget-type-id';
 import { TenantId } from '@shared/models/id/tenant-id';
 import { WidgetLayout } from '@shared/models/dashboard.models';
 import { formatValue, isDefined } from '@core/utils';
-import { forkJoin, of } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import {
@@ -79,7 +78,8 @@ import { PageLink } from '@shared/models/page/page-link';
 import { SortOrder } from '@shared/models/page/sort-order';
 import { DomSanitizer } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
+import * as RxJS from 'rxjs';
+import * as RxJSOperators from 'rxjs/operators';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { EntityId } from '@shared/models/id/entity-id';
 
@@ -203,7 +203,7 @@ export class WidgetContext {
       if (this.defaultSubscription) {
         return this.defaultSubscription.sendOneWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID);
       } else {
-        return of(null);
+        return RxJS.of(null);
       }
     },
     sendTwoWayCommand: (method, params, timeout, persistent,
@@ -211,14 +211,14 @@ export class WidgetContext {
       if (this.defaultSubscription) {
         return this.defaultSubscription.sendTwoWayCommand(method, params, timeout, persistent, retries, additionalInfo, requestUUID);
       } else {
-        return of(null);
+        return RxJS.of(null);
       }
     },
     completedCommand: () => {
       if (this.defaultSubscription) {
         return this.defaultSubscription.completedCommand();
       } else {
-        return of(null);
+        return RxJS.of(null);
       }
     }
   };
@@ -266,12 +266,9 @@ export class WidgetContext {
   private popoverComponents: TbPopoverComponent[] = [];
 
   rxjs = {
-    forkJoin,
-    of,
-    map,
-    mergeMap,
-    switchMap,
-    catchError
+
+    ...RxJS,
+    ...RxJSOperators
   };
 
   registerPopoverComponent(popoverComponent: TbPopoverComponent) {