diff --git a/client/src/models/List.js b/client/src/models/List.js
index 63bd04b9..b7664347 100755
--- a/client/src/models/List.js
+++ b/client/src/models/List.js
@@ -166,7 +166,6 @@ export default class extends BaseModel {
 
         break;
       }
-      // TODO: refactor
       case ActionTypes.LIST_UPDATE_HANDLE: {
         const listModel = List.withId(payload.list.id);
 
@@ -185,8 +184,6 @@ export default class extends BaseModel {
               isClosed = true;
             }
 
-            listModel.update(prepareList(payload.list));
-
             if (isClosed !== undefined) {
               listModel.cards.toModelArray().forEach((cardModel) => {
                 cardModel.update({
@@ -199,7 +196,9 @@ export default class extends BaseModel {
               });
             }
           }
-        } else if (payload.list.boardId !== null) {
+        }
+
+        if (payload.list.boardId !== null) {
           List.upsert(prepareList(payload.list));
         }
 
diff --git a/client/src/sagas/core/watchers/lists.js b/client/src/sagas/core/watchers/lists.js
index d92f9dd3..9481e2b9 100644
--- a/client/src/sagas/core/watchers/lists.js
+++ b/client/src/sagas/core/watchers/lists.js
@@ -25,12 +25,12 @@ export default function* listsWatchers() {
     takeEvery(EntryActionTypes.LIST_MOVE, ({ payload: { id, index } }) =>
       services.moveList(id, index),
     ),
-    takeEvery(EntryActionTypes.LIST_SORT, ({ payload: { id, data } }) =>
-      services.sortList(id, data),
-    ),
     takeEvery(EntryActionTypes.LIST_TRANSFER, ({ payload: { id, boardId, index } }) =>
       services.transferList(id, boardId, index),
     ),
+    takeEvery(EntryActionTypes.LIST_SORT, ({ payload: { id, data } }) =>
+      services.sortList(id, data),
+    ),
     takeEvery(EntryActionTypes.LIST_CARDS_TO_ARCHIVE_LIST_MOVE, ({ payload: { id } }) =>
       services.moveListCardsToArchiveList(id),
     ),
diff --git a/server/api/helpers/utils/get-available-storage.js b/server/api/helpers/utils/get-available-storage.js
index c09bce07..d3f71404 100644
--- a/server/api/helpers/utils/get-available-storage.js
+++ b/server/api/helpers/utils/get-available-storage.js
@@ -7,7 +7,7 @@ module.exports = {
   async fn() {
     const { storageLimit } = sails.config.custom;
 
-    if (_.isNil(storageLimit)) {
+    if (storageLimit === null) {
       return null;
     }
 
diff --git a/server/api/helpers/utils/receive-file.js b/server/api/helpers/utils/receive-file.js
index 0fde3812..01da7790 100644
--- a/server/api/helpers/utils/receive-file.js
+++ b/server/api/helpers/utils/receive-file.js
@@ -25,7 +25,7 @@ module.exports = {
       availableStorage = await sails.helpers.utils.getAvailableStorage();
     }
 
-    let maxBytes = _.isNil(maxUploadFileSize) ? null : maxUploadFileSize;
+    let maxBytes = maxUploadFileSize;
     if (availableStorage !== null) {
       if (maxBytes) {
         maxBytes = availableStorage < maxBytes ? availableStorage : maxBytes;
@@ -40,7 +40,7 @@ module.exports = {
           error &&
           error.code === 'E_EXCEEDS_UPLOAD_LIMIT' &&
           availableStorage !== null &&
-          (_.isNil(maxUploadFileSize) || error.maxBytes < maxUploadFileSize)
+          (maxUploadFileSize === null || error.maxBytes < maxUploadFileSize)
         ) {
           return callback(new Error('Storage limit reached'), files);
         }
diff --git a/server/api/hooks/query-methods/models/List.js b/server/api/hooks/query-methods/models/List.js
index 2f93e10a..2de4725c 100644
--- a/server/api/hooks/query-methods/models/List.js
+++ b/server/api/hooks/query-methods/models/List.js
@@ -76,19 +76,16 @@ const updateOne = async (criteria, values) => {
         .set({ ...values })
         .usingConnection(db);
 
-      let cards = [];
       let tasks = [];
-
       if (list) {
         if (list.boardId !== prev.boardId) {
-          await Card.update(
-            {
-              listId: list.id,
-            },
-            {
+          await Card.update({
+            listId: list.id,
+          })
+            .set({
               boardId: list.boardId,
-            },
-          ).usingConnection(db);
+            })
+            .usingConnection(db);
         }
 
         const prevTypeState = List.TYPE_STATE_BY_TYPE[prev.type];
@@ -102,7 +99,7 @@ const updateOne = async (criteria, values) => {
         const isClosed = transitions[`${prevTypeState}->${typeState}`];
 
         if (!_.isUndefined(isClosed)) {
-          cards = await Card.update({
+          const cards = await Card.update({
             listId: list.id,
           })
             .set({
@@ -124,7 +121,7 @@ const updateOne = async (criteria, values) => {
         }
       }
 
-      return { list, cards, tasks };
+      return { list, tasks };
     });
   }
 
diff --git a/server/api/hooks/query-methods/models/User.js b/server/api/hooks/query-methods/models/User.js
index 3886a7ba..4bcae83a 100644
--- a/server/api/hooks/query-methods/models/User.js
+++ b/server/api/hooks/query-methods/models/User.js
@@ -24,7 +24,7 @@ const defaultFind = (criteria) => User.find(criteria).sort('id');
 /* Query methods */
 
 const createOne = (values) => {
-  if (!_.isNil(sails.config.custom.activeUsersLimit)) {
+  if (sails.config.custom.activeUsersLimit !== null) {
     return sails.getDatastore().transaction(async (db) => {
       const queryResult = await sails
         .sendNativeQuery('SELECT NULL FROM user_account WHERE is_deactivated = $1 FOR UPDATE', [
@@ -80,7 +80,7 @@ const getOneActiveByEmailOrUsername = (emailOrUsername) => {
 
 const updateOne = async (criteria, values) => {
   const enforceActiveLimit =
-    values.isDeactivated === false && !_.isNil(sails.config.custom.activeUsersLimit);
+    values.isDeactivated === false && sails.config.custom.activeUsersLimit !== null;
 
   if (!_.isUndefined(values.avatar) || enforceActiveLimit) {
     return sails.getDatastore().transaction(async (db) => {
diff --git a/server/config/custom.js b/server/config/custom.js
index 92f65f74..296377cf 100644
--- a/server/config/custom.js
+++ b/server/config/custom.js
@@ -16,14 +16,14 @@ const version = require('../version');
 
 const envToNumber = (value) => {
   if (!value) {
-    return value;
+    return null;
   }
 
   const number = parseInt(value, 10);
   return Number.isNaN(number) ? null : number;
 };
 
-const envToBytes = (value) => value && bytes(value);
+const envToBytes = (value) => bytes(value);
 
 const envToArray = (value) => (value ? value.split(',') : []);