diff --git a/.eslintrc.json b/.eslintrc.json
index 147bef74..07f2e05a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -35,7 +35,6 @@
         "@typescript-eslint/no-unsafe-assignment": 0,
         "@typescript-eslint/no-unsafe-call": 0,
         "@typescript-eslint/no-unsafe-member-access": 0,
-        "@typescript-eslint/no-unsafe-return": 0,
         "@typescript-eslint/prefer-optional-chain": 0,
         "@typescript-eslint/restrict-template-expressions": 0,
         "@typescript-eslint/strict-boolean-expressions": 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d930bfc1..081d67a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.17
+
+- fix(eslint): enable no-unsafe-return rule
+
 ## 2.1.16
 
 - Add copy icon functionality in static table row
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 0513a5a6..f6aa3ca3 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -817,7 +817,7 @@ npm/npmjs/-/semver/6.3.0, ISC, approved, clearlydefined
 npm/npmjs/-/semver/7.0.0, ISC, approved, clearlydefined
 npm/npmjs/-/semver/7.5.3, ISC, approved, clearlydefined
 npm/npmjs/-/send/0.18.0, MIT, approved, clearlydefined
-npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, clearlydefined
+npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, #12680
 npm/npmjs/-/serve-favicon/2.5.0, MIT, approved, clearlydefined
 npm/npmjs/-/serve-static/1.15.0, MIT, approved, clearlydefined
 npm/npmjs/-/set-blocking/2.0.0, ISC, approved, #5899
diff --git a/package.json b/package.json
index 5434470b..b15229d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-shared-components",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "description": "Catena-X Portal Shared Components",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
diff --git a/src/components/basic/SelectList/index.tsx b/src/components/basic/SelectList/index.tsx
index 4bb94523..13c82943 100644
--- a/src/components/basic/SelectList/index.tsx
+++ b/src/components/basic/SelectList/index.tsx
@@ -78,9 +78,11 @@ export const SelectList = ({
       disabled={disabled}
       // eslint-disable-next-line
       options={items.map((item: any) => item)}
+      // eslint-disable-next-line
       getOptionLabel={(option) => option[keyTitle] || ''}
       onChange={(_, reason) => {
         setSelected(reason)
+        // eslint-disable-next-line
         onChangeItem(reason)
       }}
       isOptionEqualToValue={(option, value) => isEqual(option, value)}
diff --git a/src/components/basic/Table/index.tsx b/src/components/basic/Table/index.tsx
index 07d746a7..7265bfa0 100644
--- a/src/components/basic/Table/index.tsx
+++ b/src/components/basic/Table/index.tsx
@@ -130,6 +130,7 @@ export const Table = ({
     (selectedIds: GridRowSelectionModel) => {
       const idsArr: string[] = []
       rows.map((row) => {
+        // eslint-disable-next-line
         return selectedIds.map(
           (selectedId: GridRowId) =>
             selectedId.toString().includes(row.companyUserId) &&
@@ -203,11 +204,13 @@ export const Table = ({
               outline: 'none',
             },
         }}
+        // eslint-disable-next-line
         getRowId={(row) => row.id}
         components={{
           Toolbar: () => toolbarView(),
           NoRowsOverlay,
         }}
+        // eslint-disable-next-line
         onRowSelectionModelChange={handleOnCellClick}
         {...{
           rows,