diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
index 77b0d82d42..2b4139a622 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
@@ -2014,7 +2014,7 @@ public class CentralGitServiceCEImpl implements CentralGitServiceCE {
                     Mono<ArtifactExchangeJson> artifactExchangeJsonMono = mergeStatusDTOMono.flatMap(status ->
                             gitHandlingService.reconstructArtifactJsonFromGitRepository(jsonTransformationDTO));
 
-                    return Mono.zip(mergeStatusDTOMono, artifactExchangeJsonMono);
+                    return mergeStatusDTOMono.zipWhen(mergeStatusDTO -> artifactExchangeJsonMono);
                 })
                 .flatMap(tuple -> {
                     MergeStatusDTO status = tuple.getT1();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
index 865103b449..495771a1f9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
@@ -1837,7 +1837,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                                 status -> commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepoWithAnalytics(
                                         workspaceId, baseArtifactId, repoName, branchName, artifactType));
 
-                        return Mono.zip(pullStatusMono, artifactExchangeJsonMono);
+                        return pullStatusMono.zipWhen(mergeStatusDTO -> artifactExchangeJsonMono);
 
                     } catch (IOException e) {
                         return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, e.getMessage()));