diff --git a/frontend/src/metabase/admin/databases/database.js b/frontend/src/metabase/admin/databases/database.js
index 2241b8f962cf87a3bcdf541d35e9b0c81d2b798d..072c1e73c1a2afe671618d98ae5341443a66953e 100644
--- a/frontend/src/metabase/admin/databases/database.js
+++ b/frontend/src/metabase/admin/databases/database.js
@@ -7,7 +7,7 @@ import {
 } from "metabase/lib/redux";
 import { push } from "react-router-redux";
 import * as MetabaseAnalytics from "metabase/lib/analytics";
-import MetabaseSettings from "metabase/lib/settings";
+import { getDefaultEngine } from "metabase/lib/engine";
 
 import { MetabaseApi } from "metabase/services";
 import Databases from "metabase/entities/databases";
@@ -121,7 +121,7 @@ export const initializeDatabase = function (databaseId) {
       const newDatabase = {
         name: "",
         auto_run_queries: true,
-        engine: Object.keys(MetabaseSettings.get("engines"))[0],
+        engine: getDefaultEngine(),
         details: {},
         created: false,
       };
diff --git a/frontend/src/metabase/lib/engine.js b/frontend/src/metabase/lib/engine.js
index 4d88f7f636b2753b8df6a737340af10b4475296b..03ada35edd4cab7d689f572b7ceafb246346decd 100644
--- a/frontend/src/metabase/lib/engine.js
+++ b/frontend/src/metabase/lib/engine.js
@@ -1,6 +1,11 @@
 import Settings from "metabase/lib/settings";
 import { formatSQL } from "metabase/lib/formatting";
 
+export function getDefaultEngine() {
+  const engines = Object.keys(Settings.get("engines"));
+  return engines.includes("postgres") ? "postgres" : engines[0];
+}
+
 export function getEngineNativeType(engine) {
   switch (engine) {
     case "mongo":