diff --git a/final/server/src/index.js b/final/server/src/index.js
index 167317810..79e139b70 100644
--- a/final/server/src/index.js
+++ b/final/server/src/index.js
@@ -25,7 +25,7 @@ const dataSources = () => ({
 const context = async ({ req }) => {
   // simple auth check on every request
   const auth = (req.headers && req.headers.authorization) || '';
-  const email = new Buffer(auth, 'base64').toString('ascii');
+  const email = Buffer.from(auth, 'base64').toString('ascii');
 
   // if the email isn't formatted validly, return null for user
   if (!isEmail.validate(email)) return { user: null };
diff --git a/final/server/src/resolvers.js b/final/server/src/resolvers.js
index f32b385c2..d5818df3e 100644
--- a/final/server/src/resolvers.js
+++ b/final/server/src/resolvers.js
@@ -65,7 +65,7 @@ module.exports = {
     },
     login: async (_, { email }, { dataSources }) => {
       const user = await dataSources.userAPI.findOrCreateUser({ email });
-      if (user) return new Buffer(email).toString('base64');
+      if (user) return Buffer.from(email).toString('base64');
     },
   },
   Launch: {