diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
index ea6da0f5fc4e..2cecaaa05113 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java
@@ -1309,7 +1309,8 @@ private Mono<Set<ExecutableDependencyEdge>> addWidgetRelationshipToGraph(
 
     private boolean hasUserSetExecutableToNotRunOnPageLoad(Executable executable) {
         if (TRUE.equals(executable.getUserSetOnLoad())
-                && executable.getRunBehaviour() != RunBehaviourEnum.ON_PAGE_LOAD) {
+                && (executable.getRunBehaviour() == null
+                        || RunBehaviourEnum.MANUAL.equals(executable.getRunBehaviour()))) {
             return true;
         }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
index 124767a75871..7af73cc39880 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java
@@ -182,9 +182,10 @@ public Flux<NewAction> findUnpublishedActionsByNameInAndPageId(
     public Flux<NewAction> findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnPageLoad(
             String pageId, AclPermission permission) {
         BridgeQuery<NewAction> q = Bridge.<NewAction>or(
-                        // First condition: new runBehaviour = ON_PAGE_LOAD
-                        Bridge.<NewAction>equal(
-                                NewAction.Fields.unpublishedAction_runBehaviour, RunBehaviourEnum.ON_PAGE_LOAD),
+                        // First condition: new runBehaviour = ON_PAGE_LOAD or AUTOMATIC
+                        Bridge.<NewAction>in(
+                                NewAction.Fields.unpublishedAction_runBehaviour,
+                                List.of(RunBehaviourEnum.ON_PAGE_LOAD.name(), RunBehaviourEnum.AUTOMATIC.name())),
                         // Second condition: legacy executeOnLoad = true
                         Bridge.<NewAction>isTrue(NewAction.Fields.unpublishedAction_executeOnLoad))
                 .isTrue(NewAction.Fields.unpublishedAction_userSetOnLoad)