diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
index e41d8c734015551004701218772cd88112b59b6b..361d286aa6cdc7b4ec7d31befa227d2287b5c9a1 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
@@ -320,7 +320,9 @@ public class PropertiesConfig {
             TypedQuery<DBConfiguration> tq = em.createNamedQuery("DBConfiguration.getAll", DBConfiguration.class);
             List<DBConfiguration> lst = tq.getResultList();
             for (DBConfiguration dc : lst) {
-                setProperty(dc.getProperty(), dc.getValue());
+                if(dc.getValue()!=null) {
+                    setProperty(dc.getProperty(), dc.getValue());
+                }
             }
         }
     }