diff --git a/.eslintrc.json b/.eslintrc.json
index 10496dc6..147bef74 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -31,7 +31,6 @@
         "react/react-in-jsx-scope": 0,
         "@typescript-eslint/comma-dangle": 0,
         "@typescript-eslint/explicit-function-return-type": 0,
-        "@typescript-eslint/no-empty-function": 0,
         "@typescript-eslint/no-unsafe-argument": 0,
         "@typescript-eslint/no-unsafe-assignment": 0,
         "@typescript-eslint/no-unsafe-call": 0,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20de730..2dcdd5f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,13 @@
 # Changelog
 
 
+## 2.1.8
+
+- Fix more linter findings
+
 ## 2.1.7
 
-- Linter findings
-  - Fix ban-types
+- Fix linter findings
 
 ## 2.1.6
 
diff --git a/package.json b/package.json
index 4b7079c6..432ce83a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-shared-components",
-  "version": "2.1.9",
+  "version": "2.1.8",
   "description": "Catena-X Portal Shared Components",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
diff --git a/src/components/basic/CategoryDivider/index.tsx b/src/components/basic/CategoryDivider/index.tsx
index 7a03edcd..8584afe4 100644
--- a/src/components/basic/CategoryDivider/index.tsx
+++ b/src/components/basic/CategoryDivider/index.tsx
@@ -35,7 +35,9 @@ export const CategoryDivider = ({
   categoryItemsLength,
   categoryName,
   disabled = false,
-  onButtonClick = () => {},
+  onButtonClick = () => {
+    // do nothing
+  },
 }: CategoryDividerProps) => {
   return (
     <Box
diff --git a/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx b/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx
index ee8d4992..f5b582ac 100644
--- a/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx
+++ b/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx
@@ -27,7 +27,9 @@ import { IconButton } from '../../basic/IconButton'
 
 export const TextCenterAlignedBody2 = ({
   provider,
-  scrollTop = () => {},
+  scrollTop = () => {
+    // do nothing
+  },
   showScroll = true,
 }: {
   provider: ProviderProps
diff --git a/src/components/content/DemoComponents/TextVideoSideBySide.tsx b/src/components/content/DemoComponents/TextVideoSideBySide.tsx
index 83b11efe..941e2651 100644
--- a/src/components/content/DemoComponents/TextVideoSideBySide.tsx
+++ b/src/components/content/DemoComponents/TextVideoSideBySide.tsx
@@ -24,7 +24,9 @@ import { ImageVideoWrapper } from './components/ImageVideoWrapper'
 
 export const TextVideoSideBySide = ({
   provider,
-  scrollTop = () => {},
+  scrollTop = () => {
+    // do nothing
+  },
   showScroll = true,
 }: {
   provider: ProviderProps
diff --git a/src/components/content/DemoComponents/VideoTextSideBySide.tsx b/src/components/content/DemoComponents/VideoTextSideBySide.tsx
index ca149fc2..4be0d367 100644
--- a/src/components/content/DemoComponents/VideoTextSideBySide.tsx
+++ b/src/components/content/DemoComponents/VideoTextSideBySide.tsx
@@ -27,7 +27,9 @@ import { IconButton } from '../../basic/IconButton'
 
 export const VideoTextSideBySide = ({
   provider,
-  scrollTop = () => {},
+  scrollTop = () => {
+    // do nothing
+  },
   showScroll = true,
 }: {
   provider: ProviderProps