diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index 4e04304754..ac13aa31c8 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -418,11 +418,11 @@ export class EntityService {
         break;
       case EntityType.WIDGETS_BUNDLE:
         pageLink.sortOrder.property = 'title';
-        entitiesObservable = this.widgetService.getWidgetBundles(pageLink, true, false, config);
+        entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, subType === 'tenant', config);
         break;
       case EntityType.WIDGET_TYPE:
         pageLink.sortOrder.property = 'name';
-        entitiesObservable = this.widgetService.getWidgetTypes(pageLink, true, false, DeprecatedFilter.ALL, null, config);
+        entitiesObservable = this.widgetService.getWidgetTypes(pageLink, subType === 'tenant', false, DeprecatedFilter.ALL, null, config);
         break;
       case EntityType.NOTIFICATION_TARGET:
         pageLink.sortOrder.property = 'name';
diff --git a/ui-ngx/src/app/core/http/widget.service.ts b/ui-ngx/src/app/core/http/widget.service.ts
index 3d33aad9e7..6905a0f594 100644
--- a/ui-ngx/src/app/core/http/widget.service.ts
+++ b/ui-ngx/src/app/core/http/widget.service.ts
@@ -85,8 +85,8 @@ export class WidgetService {
     );
   }
 
-  public getWidgetBundles(pageLink: PageLink, tenantOnly = false,
-                          fullSearch = false, config?: RequestConfig): Observable<PageData<WidgetsBundle>> {
+  public getWidgetBundles(pageLink: PageLink, fullSearch = false,
+                          tenantOnly = false, config?: RequestConfig): Observable<PageData<WidgetsBundle>> {
     return this.http.get<PageData<WidgetsBundle>>(
       `/api/widgetsBundles${pageLink.toQuery()}&tenantOnly=${tenantOnly}&fullSearch=${fullSearch}`,
       defaultHttpOptionsFromConfig(config)
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
index ef09a2b382..11b37245fa 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
@@ -84,6 +84,7 @@
               fxFlex
               [fxShow]="!entityTypeFormGroup.get('config').get('allEntities').value"
               [entityType]="entityTypeFormGroup.get('entityType').value"
+              subType="tenant"
               required
               formControlName="entityIds">
             </tb-entity-list>