diff --git a/common/src/main/java/io/druid/common/config/ConfigManager.java b/common/src/main/java/io/druid/common/config/ConfigManager.java
index 172c82a6e1c..308fd392fd3 100644
--- a/common/src/main/java/io/druid/common/config/ConfigManager.java
+++ b/common/src/main/java/io/druid/common/config/ConfigManager.java
@@ -28,6 +28,7 @@ import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
+import io.druid.db.DbConnector;
 import io.druid.db.DbTablesConfig;
 import org.joda.time.Duration;
 import org.skife.jdbi.v2.Handle;
@@ -79,7 +80,13 @@ public class ConfigManager
 
     this.selectStatement = String.format("SELECT payload FROM %s WHERE name = :name", configTable);
     this.insertStatement = String.format(
-        "INSERT INTO %s (name, payload) VALUES (:name, :payload) ON DUPLICATE KEY UPDATE payload = :payload",
+        DbConnector.isPostgreSQL(dbi) ?
+          "BEGIN;\n" +
+          "LOCK TABLE %1$s IN SHARE ROW EXCLUSIVE MODE;\n" +
+          "WITH upsert AS (UPDATE %1$s SET payload=:payload WHERE name=:name RETURNING *)\n" +
+          "    INSERT INTO %1$s (name, payload) SELECT :name, :payload WHERE NOT EXISTS (SELECT * FROM upsert)\n;" +
+          "COMMIT;" :
+          "INSERT INTO %s (name, payload) VALUES (:name, :payload) ON DUPLICATE KEY UPDATE payload = :payload",
         configTable
     );
   }
diff --git a/common/src/main/java/io/druid/db/DbConnector.java b/common/src/main/java/io/druid/db/DbConnector.java
index 1e9b81be843..1ed4e279df8 100644
--- a/common/src/main/java/io/druid/db/DbConnector.java
+++ b/common/src/main/java/io/druid/db/DbConnector.java
@@ -177,7 +177,7 @@ public class DbConnector
     }
   }
 
-  protected static Boolean isPostgreSQL(final IDBI dbi)
+  public static Boolean isPostgreSQL(final IDBI dbi)
   {
     return dbi.withHandle(
         new HandleCallback<Boolean>()