diff --git a/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java b/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java
index 4f94390a..13e9c3dd 100644
--- a/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java
+++ b/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java
@@ -84,6 +84,8 @@ public class SystemProperties {
             // load a properties file from class path, inside static method
             prop.load(input);
 
+            overideCLIParams();
+            
         } catch (IOException ex) {
             logger.error(ex.getMessage(), ex);
         } finally {
@@ -97,6 +99,13 @@ public class SystemProperties {
         }
     }
 
+    private void overideCLIParams() {
+        String value = System.getProperty("keyvalue.datasource");
+        if (value != null){
+            prop.setProperty("keyvalue.datasource", value);
+        }
+    }
+
     public boolean peerDiscovery() {
         if (prop.isEmpty()) return true;
         return Boolean.parseBoolean(prop.getProperty("peer.discovery"));