diff --git a/package.json b/package.json
index 7f3264bd967c60cc8d9adf766efa6b34aba9e437..734c11d116ef67b34971bc05d3b18a18d7c6e110 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "@types/luxon": "^3.0.0",
     "@types/react-draft-wysiwyg": "^1.13.8",
     "@vitejs/plugin-react-swc": "^3.4.0",
-    "ag-grid-community": "^30.0.0",
-    "ag-grid-react": "^30.0.0",
+    "ag-grid-community": "^31.0.0",
+    "ag-grid-react": "^31.0.0",
     "axios": "^1.0.0",
     "dayjs": "^1.10.7",
     "draft-js": "^0.11.7",
diff --git a/src/components/Consents/Consents.tsx b/src/components/Consents/Consents.tsx
index e63dcb7e6951d8b881acc50cc426b055d1ef764e..95e12e6c60e437bc24954b9253c3a52fe2563fa6 100644
--- a/src/components/Consents/Consents.tsx
+++ b/src/components/Consents/Consents.tsx
@@ -72,7 +72,7 @@ export const Consents: React.FC<{ type: 'sge' | 'grdf' }> = ({ type }) => {
   }, [])
 
   const checkSelectedNodes = useCallback(() => {
-    if (gridApi) {
+    if (gridApi && !gridApi.isDestroyed()) {
       const newNodes = gridApi.getRenderedNodes()
       const idsToCheck: string[] = selectedNodes
         .filter(node => node.isSelected)
@@ -110,7 +110,7 @@ export const Consents: React.FC<{ type: 'sge' | 'grdf' }> = ({ type }) => {
   const resetSelection = useCallback(() => {
     if (gridApi) {
       setIsShowingSelection(false)
-      gridApi.setRowData(consents)
+      gridApi.setGridOption('rowData', consents)
       gridApi.deselectAll()
       setSelectedNodes([])
     }
@@ -137,9 +137,9 @@ export const Consents: React.FC<{ type: 'sge' | 'grdf' }> = ({ type }) => {
   )
 
   const continueSelection = useCallback(() => {
-    if (gridApi) {
+    if (gridApi && !gridApi.isDestroyed()) {
       setIsShowingSelection(false)
-      gridApi?.setRowData(consents)
+      gridApi.setGridOption('rowData', consents)
       const newNodes = gridApi.getRenderedNodes()
       // We have to select nodes that have already been selected since we cannot pass a Node array to init AgGrid
       const idsToCheck: string[] = selectedNodes
@@ -155,7 +155,7 @@ export const Consents: React.FC<{ type: 'sge' | 'grdf' }> = ({ type }) => {
   const showCurrentSelection = useCallback(() => {
     setIsShowingSelection(true)
     const dataFromNode = selectedNodes.map(item => item.data)
-    selectedNodes && gridApi?.setRowData(dataFromNode)
+    selectedNodes && gridApi?.setGridOption('rowData', dataFromNode)
     gridApi?.selectAll()
   }, [gridApi, selectedNodes])
 
diff --git a/yarn.lock b/yarn.lock
index 0307d38a590e9cf12021306647fe7aa9f5ffb39e..931a27453d3531860c5655498448ed10682efcbe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1204,16 +1204,17 @@ acorn@^8.9.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
-ag-grid-community@^30.0.0:
-  version "30.2.1"
-  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-30.2.1.tgz#a83d153ad1dbec46402ebe89f74ebb4b0710b3c7"
-  integrity sha512-1slonXskJbbI9ybhTx//4YKfJpZVAEnHL8dui1rQJRSXKByUi+/f7XtvkLsbgBkawoWbqvRAySjYtvz80+kBfA==
+ag-grid-community@31.2.1, ag-grid-community@^31.0.0:
+  version "31.2.1"
+  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-31.2.1.tgz#6031c91baa5caebccfa58a5131efc13339643e50"
+  integrity sha512-D+gnUQ4dHZ/EQJmupQnDqcEKiCEeuK5ZxlsIpdPKgHg/23dmW+aEdivtB9nLpSc2IEK0RUpchcSxeUT37Boo5A==
 
-ag-grid-react@^30.0.0:
-  version "30.2.1"
-  resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-30.2.1.tgz#2005f93569d4101bc3751b20491f3560db7c8c54"
-  integrity sha512-WYt5ZstSoPEGAcTqXBdaonihXtapZdjTHZ3dc3xTK1xIdbF0/Vw4zDWCQSsG5H4M5CeUKjvbeHx7kKM1Yiah3g==
+ag-grid-react@^31.0.0:
+  version "31.2.1"
+  resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-31.2.1.tgz#21be0703225e4c7ad88b1b6ca13491a6d9a072c1"
+  integrity sha512-9UH3xxXRwZfW97oz58KboyCJl4t+zdetopieeHVcttsXX1DvGFDUIEz7A1sQaG8e1DAXLMf3IxoIPrfWheH4XA==
   dependencies:
+    ag-grid-community "31.2.1"
     prop-types "^15.8.1"
 
 ajv@^6.12.4: