diff --git a/client/src/javascript/components/general/SortableList.js b/client/src/javascript/components/general/SortableList.js
index 36dd6158..832352a2 100644
--- a/client/src/javascript/components/general/SortableList.js
+++ b/client/src/javascript/components/general/SortableList.js
@@ -1,7 +1,7 @@
 import classnames from 'classnames';
-import {DragDropContext} from 'react-dnd';
+import {DndProvider} from 'react-dnd';
 import {injectIntl} from 'react-intl';
-import HTML5Backend from 'react-dnd-html5-backend';
+import {HTML5Backend} from 'react-dnd-html5-backend';
 import React from 'react';
 
 import SortableListItemDragLayer from './SortableListItemDragLayer';
@@ -109,4 +109,12 @@ class SortableList extends React.Component {
   }
 }
 
-export default DragDropContext(HTML5Backend)(injectIntl(SortableList));
+const DndSortableList = (props) => {
+  return (
+    <DndProvider backend={HTML5Backend}>
+      <SortableList {...props} />
+    </DndProvider>
+  );
+};
+
+export default injectIntl(DndSortableList);
diff --git a/package-lock.json b/package-lock.json
index ab82d5d5..1e72f703 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1346,6 +1346,21 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "@react-dnd/asap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.0.tgz",
+      "integrity": "sha512-0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ=="
+    },
+    "@react-dnd/invariant": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
+      "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+    },
+    "@react-dnd/shallowequal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
+      "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+    },
     "@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -5868,20 +5883,14 @@
         }
       }
     },
-    "disposables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.2.tgz",
-      "integrity": "sha1-NsamdEdfVaLWkTVnpgFETkh7S24="
-    },
     "dnd-core": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.6.0.tgz",
-      "integrity": "sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
+      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
       "requires": {
-        "asap": "^2.0.6",
-        "invariant": "^2.0.0",
-        "lodash": "^4.2.0",
-        "redux": "^3.7.1"
+        "@react-dnd/asap": "^4.0.0",
+        "@react-dnd/invariant": "^2.0.0",
+        "redux": "^4.0.4"
       }
     },
     "dns-equal": {
@@ -8423,9 +8432,12 @@
       }
     },
     "hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
     },
     "hosted-git-info": {
       "version": "2.7.1",
@@ -10315,11 +10327,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
       "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
-    "lodash-es": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.11.tgz",
-      "integrity": "sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q=="
-    },
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -13339,24 +13346,22 @@
       }
     },
     "react-dnd": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.6.0.tgz",
-      "integrity": "sha1-f6JWds+CfViokSk+PBq1naACVFo=",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-11.1.3.tgz",
+      "integrity": "sha512-8rtzzT8iwHgdSC89VktwhqdKKtfXaAyC4wiqp0SywpHG12TTLvfOoL6xNEIUWXwIEWu+CFfDn4GZJyynCEuHIQ==",
       "requires": {
-        "disposables": "^1.0.1",
-        "dnd-core": "^2.6.0",
-        "hoist-non-react-statics": "^2.1.0",
-        "invariant": "^2.1.0",
-        "lodash": "^4.2.0",
-        "prop-types": "^15.5.10"
+        "@react-dnd/shallowequal": "^2.0.0",
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "dnd-core": "^11.1.3",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
     "react-dnd-html5-backend": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz",
-      "integrity": "sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-11.1.3.tgz",
+      "integrity": "sha512-/1FjNlJbW/ivkUxlxQd7o3trA5DE33QiRZgxent3zKme8DwF4Nbw3OFVhTRFGaYhHFNL1rZt6Rdj1D78BjnNLw==",
       "requires": {
-        "lodash": "^4.2.0"
+        "dnd-core": "^11.1.3"
       }
     },
     "react-dom": {
@@ -13928,14 +13933,12 @@
       }
     },
     "redux": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
-      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz",
+      "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==",
       "requires": {
-        "lodash": "^4.2.1",
-        "lodash-es": "^4.2.1",
-        "loose-envify": "^1.1.0",
-        "symbol-observable": "^1.0.3"
+        "loose-envify": "^1.4.0",
+        "symbol-observable": "^1.2.0"
       }
     },
     "regenerate": {
diff --git a/package.json b/package.json
index 54a21b1d..32752c72 100644
--- a/package.json
+++ b/package.json
@@ -75,8 +75,8 @@
     "promise": "^8.1.0",
     "react": "^16.13.1",
     "react-custom-scrollbars": "^4.2.1",
-    "react-dnd": "^2.6.0",
-    "react-dnd-html5-backend": "^2.6.0",
+    "react-dnd": "^11.1.3",
+    "react-dnd-html5-backend": "^11.1.3",
     "react-dom": "^16.13.1",
     "react-dropzone": "^11.0.2",
     "react-intl": "^5.4.7",