diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java
index d8ef2313e2..b5df4d8707 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCE.java
@@ -1,9 +1,12 @@
 package com.appsmith.server.repositories.ce;
 
+import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.external.models.DatasourceStructure;
 import reactor.core.publisher.Mono;
 
 public interface CustomDatasourceStorageStructureRepositoryCE {
 
     Mono<Integer> updateStructure(String datasourceId, String environmentId, DatasourceStructure structure);
+
+    Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java
index bf59b2f36e..288acb56d5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceStorageStructureRepositoryCEImpl.java
@@ -3,6 +3,7 @@ package com.appsmith.server.repositories.ce;
 import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.external.models.DatasourceStructure;
 import com.appsmith.server.helpers.ce.bridge.Bridge;
+import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
 import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
@@ -19,4 +20,13 @@ public class CustomDatasourceStorageStructureRepositoryCEImpl
                         .equal(DatasourceStorageStructure.Fields.environmentId, environmentId))
                 .updateFirst(Bridge.update().set(DatasourceStorageStructure.Fields.structure, structure));
     }
+
+    @Override
+    public Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(
+            String datasourceId, String environmentId) {
+        final BridgeQuery<DatasourceStorageStructure> q = Bridge.<DatasourceStorageStructure>equal(
+                        DatasourceStorageStructure.Fields.datasourceId, datasourceId)
+                .equal(DatasourceStorageStructure.Fields.environmentId, environmentId);
+        return queryBuilder().criteria(q).one();
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java
index 23e69f5bf8..0baf86c990 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceStorageStructureRepositoryCE.java
@@ -3,10 +3,8 @@ package com.appsmith.server.repositories.ce;
 import com.appsmith.external.models.DatasourceStorageStructure;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomDatasourceStorageStructureRepository;
-import reactor.core.publisher.Mono;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface DatasourceStorageStructureRepositoryCE
-        extends BaseRepository<DatasourceStorageStructure, String>, CustomDatasourceStorageStructureRepository {
-
-    Mono<DatasourceStorageStructure> findByDatasourceIdAndEnvironmentId(String datasourceId, String environmentId);
-}
+        extends BaseRepository<DatasourceStorageStructure, String>, CustomDatasourceStorageStructureRepository {}