diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
index 9e5c99544a..a25388a3cb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
@@ -8,6 +8,7 @@ import lombok.Setter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
@@ -17,6 +18,7 @@ import java.util.List;
 
 @Getter
 @Setter
+@EnableMongoAuditing
 @Configuration
 public class CommonConfig {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
index cb3b59990e..f7fccfc72f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MongoConfig.java
@@ -5,11 +5,9 @@ import com.mongodb.reactivestreams.client.MongoClients;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
-import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
 
-@EnableMongoAuditing
 @EnableReactiveMongoRepositories
 public class MongoConfig extends AbstractReactiveMongoConfiguration {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/BaseDomain.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/BaseDomain.java
index 3f0a16b225..28404a346b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/BaseDomain.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/BaseDomain.java
@@ -27,7 +27,7 @@ public abstract class BaseDomain implements Persistable<String> {
     protected Date createdAt;
 
     @LastModifiedDate
-    protected Date updatedAt;
+    protected Date updatedAt = new Date();
 
     @CreatedBy
     protected String createdBy;