diff --git a/src/generators/app/index.js b/src/generators/app/index.js
index d318c88a7..d14475143 100644
--- a/src/generators/app/index.js
+++ b/src/generators/app/index.js
@@ -471,7 +471,7 @@ export class Generator extends Base {
               .toSource();
           }
 
-          file.contents = new Buffer(contents);
+          file.contents = Buffer.from(contents);
         });
 
         let clientJsFilter = filter(['client/**/*.js'], {restore: true});
@@ -508,7 +508,7 @@ export class Generator extends Base {
             tap(function(file, t) {
               var contents = file.contents.toString();
               contents = replacer(contents);
-              file.contents = new Buffer(contents);
+              file.contents = Buffer.from(contents);
             }),
             tsFilter.restore
           ]);
@@ -546,7 +546,7 @@ export class Generator extends Base {
             }),
             tap(file => {
               const contents = pugReplacer(file.contents.toString());
-              file.contents = new Buffer(contents);
+              file.contents = Buffer.from(contents);
             }),
             pugFilter.restore
           ]);
diff --git a/templates/app/server/api/user(auth)/user.model(mongooseModels).js b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
index dedb14fa8..27e6ac1d8 100644
--- a/templates/app/server/api/user(auth)/user.model(mongooseModels).js
+++ b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
@@ -241,7 +241,7 @@ UserSchema.methods = {
 
         var defaultIterations = 10000;
         var defaultKeyLength = 64;
-        var salt = new Buffer(this.salt, 'base64');
+        var salt = Buffer.from(this.salt, 'base64');
 
         if(!callback) {
             return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength, 'sha256')
diff --git a/templates/app/server/api/user(auth)/user.model(sequelizeModels).js b/templates/app/server/api/user(auth)/user.model(sequelizeModels).js
index 5ac47112a..c1d41a18d 100644
--- a/templates/app/server/api/user(auth)/user.model(sequelizeModels).js
+++ b/templates/app/server/api/user(auth)/user.model(sequelizeModels).js
@@ -163,7 +163,7 @@ export default function(sequelize, DataTypes) {
 
         var defaultIterations = 10000;
         var defaultKeyLength = 64;
-        var salt = new Buffer(this.salt, 'base64');
+        var salt = Buffer.from(this.salt, 'base64');
 
         if(!callback) {
             return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength, 'sha256')