diff --git a/apps/nextjs/src/components/board/items/item-content.tsx b/apps/nextjs/src/components/board/items/item-content.tsx
index 12e4e5961..6db4bb9d4 100644
--- a/apps/nextjs/src/components/board/items/item-content.tsx
+++ b/apps/nextjs/src/components/board/items/item-content.tsx
@@ -82,9 +82,8 @@ const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
             when={
               widgetSupportsIntegrations &&
               item.integrationIds.length === 0 &&
-              "integrationsRequired" in definition &&
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              definition.integrationsRequired !== false
+              (!("integrationsRequired" in definition) || definition.integrationsRequired !== false)
             }
           />
           <BoardItemMenu offset={4} item={newItem} />
diff --git a/packages/widgets/src/smart-home/entity-state/component.tsx b/packages/widgets/src/smart-home/entity-state/component.tsx
index 766c9aaf8..ece090c56 100644
--- a/packages/widgets/src/smart-home/entity-state/component.tsx
+++ b/packages/widgets/src/smart-home/entity-state/component.tsx
@@ -77,7 +77,12 @@ export default function SmartHomeEntityStateWidget({
       onClick={handleClick}
       w="100%"
       h="100%"
-      styles={{ root: { cursor: options.clickable && !isEditMode ? "pointer" : "initial" } }}
+      styles={{
+        root: {
+          cursor: options.clickable && !isEditMode ? "pointer" : "initial",
+          pointerEvents: isEditMode ? "none" : undefined,
+        },
+      }}
     >
       <Center h="100%" w="100%">
         <Stack align="center" gap="md">
diff --git a/packages/widgets/src/smart-home/execute-automation/component.tsx b/packages/widgets/src/smart-home/execute-automation/component.tsx
index 9777138bc..7834b08f9 100644
--- a/packages/widgets/src/smart-home/execute-automation/component.tsx
+++ b/packages/widgets/src/smart-home/execute-automation/component.tsx
@@ -60,7 +60,12 @@ export default function SmartHomeTriggerAutomationWidget({
   );
 
   return (
-    <UnstyledButton onClick={handleClick} style={{ cursor: !isEditMode ? "pointer" : "initial" }} w="100%" h="100%">
+    <UnstyledButton
+      onClick={handleClick}
+      style={{ cursor: !isEditMode ? "pointer" : "initial", pointerEvents: isEditMode ? "none" : undefined }}
+      w="100%"
+      h="100%"
+    >
       {isShowSuccess && (
         <Overlay>
           <Center w="100%" h="100%">