diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
index 3668c30d2f..a128aaa280 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
@@ -12,7 +12,6 @@ import {
 } from '@strapi/helper-plugin';
 import { Main } from '@strapi/design-system/Main';
 import { Formik } from 'formik';
-import { get } from 'lodash';
 import { useRouteMatch, useHistory } from 'react-router-dom';
 import { useQuery } from 'react-query';
 import { formatAPIErrors } from '../../../../../utils';
@@ -205,12 +204,12 @@ const ApiTokenCreateView = () => {
       if (err?.response?.data?.error?.message === MSG_ERROR_NAME_TAKEN) {
         toggleNotification({
           type: 'warning',
-          message: get(err, 'response.data.message', 'notification.error.tokennamenotunique'),
+          message: err.response.data.message || 'notification.error.tokennamenotunique',
         });
       } else {
         toggleNotification({
           type: 'warning',
-          message: get(err, 'response.data.message', 'notification.error'),
+          message: err?.response?.data?.message || 'notification.error',
         });
       }
       unlockApp();
diff --git a/packages/core/email/admin/src/pages/Settings/index.js b/packages/core/email/admin/src/pages/Settings/index.js
index d87dd47893..5163e46eff 100644
--- a/packages/core/email/admin/src/pages/Settings/index.js
+++ b/packages/core/email/admin/src/pages/Settings/index.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'react-intl';
-import { get } from 'lodash';
 import {
   getYupInnerErrors,
   CheckPagePermissions,
@@ -63,7 +62,7 @@ const SettingsPage = () => {
 
         setConfig(config);
 
-        const testAddressFound = get(config, 'settings.testAddress');
+        const testAddressFound = config?.settings?.testAddress;
 
         if (testAddressFound) {
           setTestAddress(testAddressFound);
diff --git a/packages/core/email/server/bootstrap.js b/packages/core/email/server/bootstrap.js
index 6632c266af..f4a15d3ba0 100644
--- a/packages/core/email/server/bootstrap.js
+++ b/packages/core/email/server/bootstrap.js
@@ -1,9 +1,7 @@
 'use strict';
 
-const _ = require('lodash');
-
 const createProvider = (emailConfig) => {
-  const providerName = _.toLower(emailConfig.provider);
+  const providerName = emailConfig.provider.toLowerCase();
   let provider;
 
   let modulePath;
diff --git a/packages/core/email/server/controllers/email.js b/packages/core/email/server/controllers/email.js
index 4ddb6ce36c..3aebf30a5d 100644
--- a/packages/core/email/server/controllers/email.js
+++ b/packages/core/email/server/controllers/email.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { isNil, pick } = require('lodash/fp');
+const { pick } = require('lodash/fp');
 const { ApplicationError } = require('@strapi/utils').errors;
 
 /**
@@ -29,7 +29,7 @@ module.exports = {
   async test(ctx) {
     const { to } = ctx.request.body;
 
-    if (isNil(to)) {
+    if (!to) {
       throw new ApplicationError('No recipient(s) are given');
     }