diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index 31c04e4f69..0b1cf3ba84 100755
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -44,13 +44,9 @@ module.exports = function (strapi) {
 
         // Connect to mongo database
         if (_.isEmpty(username) || _.isEmpty(password)) {
-          instance.connect(`mongodb://${host}:${port}/${database}`, {
-            useMongoClient: true
-          });
+          instance.connect(`mongodb://${host}:${port}/${database}`);
         } else {
-          instance.connect(`mongodb://${username}:${password}@${host}:${port}/${database}`, {
-            useMongoClient: true
-          });
+          instance.connect(`mongodb://${username}:${password}@${host}:${port}/${database}`);
         }
 
         // Handle error
diff --git a/packages/strapi-mongoose/lib/utils/index.js b/packages/strapi-mongoose/lib/utils/index.js
index d64849e492..6820e8d014 100755
--- a/packages/strapi-mongoose/lib/utils/index.js
+++ b/packages/strapi-mongoose/lib/utils/index.js
@@ -5,11 +5,14 @@
  */
 
 module.exports = mongoose => {
-  require('mongoose-double')(mongoose);
   require('mongoose-float').loadType(mongoose);
 
   const SchemaTypes = mongoose.Schema.Types;
 
+  SchemaTypes.Decimal.prototype.cast = function (value) {
+    return value.toString();
+  };
+
   return {
     convertType: mongooseType => {
       switch (mongooseType.toLowerCase()) {
@@ -22,9 +25,9 @@ module.exports = mongoose => {
         case 'biginteger':
           return 'Number';
         case 'float':
-          return SchemaTypes.Float;
+          return 'Float';
         case 'decimal':
-          return SchemaTypes.Double;
+          return 'Decimal';
         case 'date':
         case 'time':
         case 'datetime':
diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json
index 3679d37897..f74ab912a0 100755
--- a/packages/strapi-mongoose/package.json
+++ b/packages/strapi-mongoose/package.json
@@ -16,8 +16,7 @@
   "main": "./lib",
   "dependencies": {
     "lodash": "^4.17.4",
-    "mongoose": "^4.11.10",
-    "mongoose-double": "0.0.1",
+    "mongoose": "^5.0.0-rc1",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
     "strapi-utils": "3.0.0-alpha.7.3"
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
index 525c83153b..44364f1983 100755
--- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
@@ -159,7 +159,7 @@ export class Edit extends React.Component {
 
     if (isObject(e.target.value) && e.target.value._isAMomentObject === true) {
       formattedValue = moment(e.target.value, 'YYYY-MM-DD HH:mm:ss').format();
-    } else if (['float', 'integer', 'bigint'].indexOf(currentSchema.fields[e.target.name].type) !== -1) {
+    } else if (['float', 'integer', 'biginteger', 'decimal'].indexOf(currentSchema.fields[e.target.name].type) !== -1) {
       formattedValue = toNumber(e.target.value);
     }