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 c8d18a3279..7e34fcf78d 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
@@ -1669,7 +1669,15 @@ public class CentralGitServiceCEImpl implements CentralGitServiceCE {
                             .filter(artifact -> {
                                 return artifact.getId().equals(baseArtifactId);
                             })
-                            .next();
+                            .collectList()
+                            .flatMap(filteredBaseArtifact -> {
+                                if (!filteredBaseArtifact.isEmpty()) {
+                                    return Mono.just(filteredBaseArtifact.get(0));
+                                }
+
+                                return Mono.error(new AppsmithException(
+                                        AppsmithError.GIT_GENERIC_ERROR, GitCommandConstants.DELETE));
+                            });
 
                     return Mono.zip(deleteAllBranchesExceptBase, removeRepoMono).map(Tuple2::getT1);
                 })