diff --git a/src/Components/Map/Layer.tsx b/src/Components/Map/Layer.tsx
index 02c125e7..bb308b65 100644
--- a/src/Components/Map/Layer.tsx
+++ b/src/Components/Map/Layer.tsx
@@ -88,7 +88,6 @@ export const Layer = ({
   const visibleGroupTypes = useVisibleGroupType()
 
   useEffect(() => {
-    // eslint-disable-next-line camelcase
     data &&
       setItemsData({
         data,
@@ -115,13 +114,13 @@ export const Layer = ({
         onlyOnePerOwner,
         customEditLink,
         customEditParameter,
+        // eslint-disable-next-line camelcase
         public_edit_items,
         listed,
         setItemFormPopup,
         itemFormPopup,
         clusterRef,
       })
-    // eslint-disable-next-line camelcase
     api &&
       setItemsApi({
         data,
@@ -148,6 +147,7 @@ export const Layer = ({
         onlyOnePerOwner,
         customEditLink,
         customEditParameter,
+        // eslint-disable-next-line camelcase
         public_edit_items,
         listed,
         setItemFormPopup,
diff --git a/src/Components/Profile/Subcomponents/SocialShareBar.tsx b/src/Components/Profile/Subcomponents/SocialShareBar.tsx
index 6cac60a4..f1f7656b 100644
--- a/src/Components/Profile/Subcomponents/SocialShareBar.tsx
+++ b/src/Components/Profile/Subcomponents/SocialShareBar.tsx
@@ -1,9 +1,11 @@
 import SocialShareButton from './SocialShareButton'
 
-// eslint-disable-next-line react/prop-types
 const SocialShareBar = ({
+  // eslint-disable-next-line react/prop-types
   url,
+  // eslint-disable-next-line react/prop-types
   title,
+  // eslint-disable-next-line react/prop-types
   platforms = ['facebook', 'twitter', 'linkedin', 'xing', 'email'],
 }) => {
   return (
diff --git a/src/Components/Profile/Subcomponents/TagsWidget.tsx b/src/Components/Profile/Subcomponents/TagsWidget.tsx
index 65d5115c..753ac6e4 100644
--- a/src/Components/Profile/Subcomponents/TagsWidget.tsx
+++ b/src/Components/Profile/Subcomponents/TagsWidget.tsx
@@ -29,10 +29,10 @@ export const TagsWidget = ({ placeholder, containerStyle, defaultTags, onUpdate
     const { key } = e
     const trimmedInput = input.trim()
 
-    // eslint-disable-next-line react/prop-types
     if (
       (key === 'Enter' || key === ',') &&
       trimmedInput.length &&
+      // eslint-disable-next-line react/prop-types
       !defaultTags.some((tag) => tag.name.toLocaleLowerCase() === trimmedInput.toLocaleLowerCase())
     ) {
       e.preventDefault()
diff --git a/src/Components/Profile/Templates/TabsForm.tsx b/src/Components/Profile/Templates/TabsForm.tsx
index f14aef5f..5b19afb2 100644
--- a/src/Components/Profile/Templates/TabsForm.tsx
+++ b/src/Components/Profile/Templates/TabsForm.tsx
@@ -33,8 +33,8 @@ export const TabsForm = ({
       const newUrl = location.pathname + '?' + params.toString()
       window.history.pushState({}, '', newUrl)
       setUrlParams(params)
-      // eslint-disable-next-line react-hooks/exhaustive-deps
     },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [location.pathname],
   )
 
diff --git a/src/Components/Profile/Templates/TabsView.tsx b/src/Components/Profile/Templates/TabsView.tsx
index 8c234fc9..d80736f1 100644
--- a/src/Components/Profile/Templates/TabsView.tsx
+++ b/src/Components/Profile/Templates/TabsView.tsx
@@ -64,8 +64,8 @@ export const TabsView = ({
       params.set('tab', `${id}`)
       const newUrl = location.pathname + '?' + params.toString()
       window.history.pushState({}, '', newUrl)
-      // eslint-disable-next-line react-hooks/exhaustive-deps
     },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [location.pathname],
   )
 
diff --git a/src/Components/Templates/EmojiPicker.tsx b/src/Components/Templates/EmojiPicker.tsx
index 6e024257..f91b35e1 100644
--- a/src/Components/Templates/EmojiPicker.tsx
+++ b/src/Components/Templates/EmojiPicker.tsx
@@ -1,12 +1,17 @@
 import { useState } from 'react'
 
-// eslint-disable-next-line react/prop-types
 export const EmojiPicker = ({
+  // eslint-disable-next-line react/prop-types
   selectedEmoji,
+  // eslint-disable-next-line react/prop-types
   selectedColor,
+  // eslint-disable-next-line react/prop-types
   selectedShape,
+  // eslint-disable-next-line react/prop-types
   setSelectedEmoji,
+  // eslint-disable-next-line react/prop-types
   setSelectedColor,
+  // eslint-disable-next-line react/prop-types
   setSelectedShape,
 }) => {
   const [isOpen, setIsOpen] = useState(false)
diff --git a/src/Utils/ReplaceURLs.ts b/src/Utils/ReplaceURLs.ts
index f0213848..04436dbe 100644
--- a/src/Utils/ReplaceURLs.ts
+++ b/src/Utils/ReplaceURLs.ts
@@ -1,5 +1,5 @@
-// eslint-disable-next-line no-useless-escape
 export const urlRegex =
+  // eslint-disable-next-line no-useless-escape
   /(^| )(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(:[0-9]{1,10})?(\/.*)?$/gm
 export const mailRegex = /([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)/gi