diff --git a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
index 2a68251c3d..d3fdd47bba 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
@@ -42,7 +42,7 @@ import {
   WidgetActionDialogData
 } from '@home/components/widget/action/widget-action-dialog.component';
 import { deepClone } from '@core/utils';
-import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { widgetType } from '@shared/models/widget.models';
 
 @Component({
   selector: 'tb-manage-widget-actions',
@@ -60,7 +60,7 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
 
   @Input() disabled: boolean;
 
-  @Input() modelValue: WidgetConfigComponentData;
+  @Input() widgetType: widgetType;
 
   @Input() callbacks: WidgetActionCallbacks;
 
@@ -184,7 +184,7 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
         callbacks: this.callbacks,
         actionsData,
         action: deepClone(action),
-        modelValue: this.modelValue
+        widgetType: this.widgetType
       }
     }).afterClosed().subscribe(
       (res) => {
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
index 36234da531..2c7b826200 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
@@ -120,7 +120,7 @@
                                      widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
                                      widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ?
                                      widgetActionFormGroup.get('type').value : ''">
-          <mat-checkbox *ngIf="data.modelValue.widgetType !== widgetType.static" formControlName="setEntityId">
+          <mat-checkbox *ngIf="data.widgetType !== widgetType.static" formControlName="setEntityId">
             {{ 'widget-action.set-entity-from-widget' | translate }}
           </mat-checkbox>
           <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
index 76956152fa..8930456636 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
@@ -28,9 +28,6 @@ import {
   ValidatorFn,
   Validators
 } from '@angular/forms';
-import {
-  WidgetConfigComponentData
-} from '@home/models/widget-component.models';
 import { Observable, of } from 'rxjs';
 import { Router } from '@angular/router';
 import { DialogComponent } from '@app/shared/components/dialog.component';
@@ -56,7 +53,7 @@ export interface WidgetActionDialogData {
   callbacks: WidgetActionCallbacks;
   actionsData: WidgetActionsData;
   action?: WidgetActionDescriptorInfo;
-  modelValue: WidgetConfigComponentData;
+  widgetType: widgetType;
 }
 
 @Component({
@@ -147,7 +144,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
           );
           this.actionTypeFormGroup.addControl(
             'setEntityId',
-            this.fb.control(action ? action.setEntityId : this.data.modelValue.widgetType === widgetType.static ? false : true , [])
+            this.fb.control(this.data.widgetType === widgetType.static ? false : action ? action.setEntityId : true, [])
           );
           this.actionTypeFormGroup.addControl(
             'stateEntityParamName',
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index 634daa42c3..df8e023a90 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -443,7 +443,7 @@
   <mat-tab label="{{ 'widget-config.actions' | translate }}" [formGroup]="actionsSettings">
     <tb-manage-widget-actions
       [callbacks]="widgetConfigCallbacks"
-      [modelValue] = "modelValue"
+      [widgetType] = "modelValue.widgetType"
       formControlName="actionsData">
     </tb-manage-widget-actions>
   </mat-tab>
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
index 4caf5f3edd..d010ea24a0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
@@ -1015,7 +1015,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
     const type = descriptor.type;
     const targetEntityParamName = descriptor.stateEntityParamName;
     let targetEntityId: EntityId;
-    if (descriptor.setEntityId && validateEntityId(entityId)) {
+    if (this.widgetInfo.type !== 'static' && descriptor.setEntityId && validateEntityId(entityId)) {
       targetEntityId = entityId;
     }
     switch (type) {