diff --git a/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java b/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
index 49e113d23..bfee2eddb 100644
--- a/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
+++ b/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
@@ -1047,10 +1047,10 @@ public void saveProperty(String category, String name, String value) {
             parameterMap.put("name", name);
             parameterMap.put("value", value);
 
-            if (getProperty(category, name) == null) {
-                SqlConfig.getInstance().getSqlSessionManager().insert("Configuration.insertProperty", parameterMap);
-            } else {
-                SqlConfig.getInstance().getSqlSessionManager().insert("Configuration.updateProperty", parameterMap);
+            SqlSessionManager sqlSessionManager = SqlConfig.getInstance().getSqlSessionManager();
+            int updatedRows = sqlSessionManager.update("Configuration.updateProperty", parameterMap);
+            if (updatedRows == 0) {
+                sqlSessionManager.insert("Configuration.insertProperty", parameterMap);
             }
 
             if (DatabaseUtil.statementExists("Configuration.vacuumConfigurationTable")) {