diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
index f193d2e7270..d6208c301bb 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
@@ -144,8 +144,7 @@ public class OpenMetadataApplication extends Application<OpenMetadataApplication
     MicrometerBundleSingleton.initLatencyEvents(catalogConfig);
 
     jdbi = createAndSetupJDBI(environment, catalogConfig.getDataSourceFactory());
-    CollectionDAO collectionDAO = jdbi.onDemand(CollectionDAO.class);
-    Entity.setCollectionDAO(collectionDAO);
+    Entity.setCollectionDAO(getDao(jdbi));
 
     // initialize Search Repository, all repositories use SearchRepository this line should always
     // before initializing repository
@@ -245,6 +244,10 @@ public class OpenMetadataApplication extends Application<OpenMetadataApplication
     pipelineServiceStatusJobHandler.addPipelineServiceStatusJob();
   }
 
+  protected CollectionDAO getDao(Jdbi jdbi) {
+    return jdbi.onDemand(CollectionDAO.class);
+  }
+
   private void registerSamlHandlers(
       OpenMetadataApplicationConfig catalogConfig, Environment environment)
       throws IOException, CertificateException, KeyStoreException, NoSuchAlgorithmException {