diff --git a/server/core/db.js b/server/core/db.js
index 00126e09..019dfd1e 100644
--- a/server/core/db.js
+++ b/server/core/db.js
@@ -106,8 +106,14 @@ module.exports = {
 
         if (_.isPlainObject(dbConfig)) {
           dbConfig.appName = 'Wiki.js'
+          _.set(dbConfig, 'options.appName', 'Wiki.js')
+
+          dbConfig.enableArithAbort = true
+          _.set(dbConfig, 'options.enableArithAbort', true)
+
           if (dbUseSSL) {
             dbConfig.encrypt = true
+            _.set(dbConfig, 'options.encrypt', true)
           }
         }
         break