diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
index 4ace303e6bc8..435c489799af 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepository.java
@@ -2,7 +2,6 @@
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Application;
-import com.appsmith.server.domains.Page;
 import com.mongodb.client.result.UpdateResult;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -21,6 +20,8 @@ public interface CustomApplicationRepository extends AppsmithRepository<Applicat
 
     Flux<Application> findByClonedFromApplicationId(String applicationId, AclPermission permission);
 
-    Mono<UpdateResult> addPageToApplication(Application application, Page page, boolean isDefault);
+    Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault);
+
+    Mono<UpdateResult> setDefaultPage(String applicationId, String pageId);
 
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
index 0d41f9bb901d..3718cce1fb6d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApplicationRepositoryImpl.java
@@ -4,11 +4,11 @@
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationPage;
-import com.appsmith.server.domains.Page;
 import com.appsmith.server.domains.QApplication;
 import com.mongodb.client.result.UpdateResult;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -73,13 +73,30 @@ public Flux<Application> findByClonedFromApplicationId(String applicationId, Acl
     }
 
     @Override
-    public Mono<UpdateResult> addPageToApplication(Application application, Page page, boolean isDefault) {
-        final ApplicationPage applicationPage = new ApplicationPage(page.getId(), isDefault);
+    public Mono<UpdateResult> addPageToApplication(String applicationId, String pageId, boolean isDefault) {
+        final ApplicationPage applicationPage = new ApplicationPage(pageId, isDefault);
         return mongoOperations.updateFirst(
-                Query.query(getIdCriteria(application.getId())),
+                Query.query(getIdCriteria(applicationId)),
                 new Update().addToSet(FieldName.PAGES, applicationPage),
                 Application.class
         );
     }
 
+    @Override
+    public Mono<UpdateResult> setDefaultPage(String applicationId, String pageId) {
+        final Mono<UpdateResult> setAllAsNonDefaultMono = mongoOperations.updateFirst(
+                Query.query(getIdCriteria(applicationId)).addCriteria(Criteria.where("pages.isDefault").is(true)),
+                new Update().set("pages.$.isDefault", false),
+                Application.class
+        );
+
+        final Mono<UpdateResult> setDefaultMono = mongoOperations.updateFirst(
+                Query.query(getIdCriteria(applicationId)).addCriteria(Criteria.where("pages._id").is(new ObjectId(pageId))),
+                new Update().set("pages.$.isDefault", true),
+                Application.class
+        );
+
+        return setAllAsNonDefaultMono.then(setDefaultMono);
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index 3cf4f4368e5c..b475ed18afa3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -124,7 +124,7 @@ public Mono<Page> createPage(Page page) {
      */
     @Override
     public Mono<UpdateResult> addPageToApplication(Application application, Page page, Boolean isDefault) {
-        return applicationRepository.addPageToApplication(application, page, isDefault)
+        return applicationRepository.addPageToApplication(application.getId(), page.getId(), isDefault)
                 .doOnSuccess(result -> {
                     if (result.getModifiedCount() != 1) {
                         log.error("Add page to application didn't update anything, probably because application wasn't found.");
@@ -195,14 +195,11 @@ public Mono<Application> makePageDefault(String applicationId, String pageId) {
                 })
                 .then(applicationService.findById(applicationId))
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId)))
-                .flatMap(application -> {
-                    List<ApplicationPage> pages = application.getPages();
-
-                    // We are guaranteed to find the pageId in this list.
-                    pages.forEach(page -> page.setIsDefault(page.getId().equals(pageId)));
-
-                    return applicationService.save(application);
-                });
+                .flatMap(application ->
+                        applicationRepository
+                                .setDefaultPage(applicationId, pageId)
+                                .then(applicationService.getById(applicationId))
+                );
     }
 
     @Override
diff --git a/static/demo.gif b/static/demo.gif
index e2989eab99c0..7a04795c1c17 100644
Binary files a/static/demo.gif and b/static/demo.gif differ