diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
index 889efea..26ab2fe 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
@@ -489,6 +489,11 @@
    */
   public static boolean executeDdlSql(String sql) throws Exception {
     DataSource datasource = ConfigurationDataSource.lookup();
+    if (datasource == null) {
+      System.err.println("DB configuration not found. Configuration management will be using "
+          + "in-memory persistence.");
+      return false;
+    }
     try (Connection con = datasource.getConnection(); Statement stmt = con.createStatement()) {
       stmt.executeQuery(sql);
     } catch (Exception exception) {
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java
index edbae2f..0cfc96b 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java
@@ -2,6 +2,7 @@
 
 import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.config.ConfigurationUtils;
 import org.openecomp.config.Constants;
 
@@ -52,6 +53,9 @@
   public static BasicDataSource initDataSource() throws Exception {
     ImmutableConfiguration dbConfig = ConfigurationRepository.lookup()
         .getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE);
+    if (StringUtils.isEmpty(dbConfig.getString("dbhost"))) {
+      return null;
+    }
     BasicDataSource datasource = new BasicDataSource();
     String driverClassName = dbConfig.getString("driverClassName");
     String jdbcUrl = dbConfig.getString("jdbcURL");
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties
index 934f0fc..cfe91e6 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties
@@ -8,7 +8,7 @@
 configValue=value
 configNameColumn=name
 configdb=dox
-dbhost=127.0.0.1
+dbhost=
 dbport=9042
 dbname=cassandra
 createtablecql=create table if not exists ${configdb}.${config.Table} (name text\, key text\, value text\, PRIMARY KEY (name\, key)) with clustering order by (key asc)
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties
index 934f0fc..cfe91e6 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties
@@ -8,7 +8,7 @@
 configValue=value
 configNameColumn=name
 configdb=dox
-dbhost=127.0.0.1
+dbhost=
 dbport=9042
 dbname=cassandra
 createtablecql=create table if not exists ${configdb}.${config.Table} (name text\, key text\, value text\, PRIMARY KEY (name\, key)) with clustering order by (key asc)