diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/git/GitConfigCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/git/GitConfigCEImpl.java
index dc0950b714..b75010ad32 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/git/GitConfigCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/git/GitConfigCEImpl.java
@@ -14,7 +14,9 @@ public class GitConfigCEImpl implements GitConfigCE {
 
     @Override
     public Mono<Boolean> getIsAtomicPushAllowed() {
-        return tenantService.getTenantConfiguration().map(tenant -> tenant.getTenantConfiguration()
-                .getIsAtomicPushAllowed());
+        return tenantService
+                .getTenantConfiguration()
+                .map(tenant -> tenant.getTenantConfiguration().getIsAtomicPushAllowed())
+                .switchIfEmpty(Mono.just(false));
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
index c92f20a87c..74a62527e4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
@@ -54,7 +54,7 @@ public class TenantConfigurationCE implements Serializable {
 
     Boolean isStrongPasswordPolicyEnabled;
 
-    private Boolean isAtomicPushAllowed;
+    private Boolean isAtomicPushAllowed = false;
 
     public void addThirdPartyAuth(String auth) {
         if (thirdPartyAuths == null) {