diff --git a/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java b/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
index 0553b207717..89e98adfa71 100644
--- a/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
+++ b/core/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
@@ -157,14 +157,24 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
 			ResultSet rs = stmt.executeQuery();
 			if(rs != null && rs.next()) {
 				returnValue =  rs.getString(1);
-			} else {
-				stmtInsert = txn.prepareAutoCloseStatement("INSERT INTO configuration(instance, name, value, description) VALUES('DEFAULT', ?, ?, '')");
-				stmtInsert.setString(1, name);
-				stmtInsert.setString(2, initValue);
-				if(stmtInsert.executeUpdate() < 1) {
-					throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
+				if(returnValue != null) {
+					txn.commit();
+					return returnValue;
+				} else {
+					// restore init value
+					returnValue = initValue;
 				}
 			}
+			stmt.close();
+			
+			stmtInsert = txn.prepareAutoCloseStatement(
+				"INSERT INTO configuration(instance, name, value, description) VALUES('DEFAULT', ?, ?, '') ON DUPLICATE KEY UPDATE value=?");
+			stmtInsert.setString(1, name);
+			stmtInsert.setString(2, initValue);
+			stmtInsert.setString(3, initValue);
+			if(stmtInsert.executeUpdate() < 1) {
+				throw new CloudRuntimeException("Unable to init configuration variable: " + name); 
+			}
 			txn.commit();
 			return returnValue;
 		} catch (Exception e) {