diff --git a/.eslintrc.js b/.eslintrc.js
index 9ba7d4cc..d5873c77 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-undef
 module.exports = {
   env: {
     browser: true,
@@ -7,7 +6,7 @@ module.exports = {
   extends: [
     'standard',
     'eslint:recommended',
-    // 'plugin:@eslint-community/eslint-comments/recommended',
+    'plugin:@eslint-community/eslint-comments/recommended',
     // 'plugin:@typescript-eslint/recommended',
     // 'plugin:import/recommended',
     // 'plugin:import/typescript',
@@ -56,9 +55,9 @@ module.exports = {
     //         ignores: ['+Page'],
     //       },
     //     ],
-    //     // Optional eslint-comments rule
-    //     '@eslint-community/eslint-comments/no-unused-disable': 'error',
-    //     '@eslint-community/eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
+    // Optional eslint-comments rule
+    '@eslint-community/eslint-comments/no-unused-disable': 'error',
+    '@eslint-community/eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
     //     // import
     //     'import/export': 'error',
     //     'import/no-deprecated': 'error',
diff --git a/package-lock.json b/package-lock.json
index 6b861ac4..eeeb13f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,6 +30,7 @@
         "tw-elements": "^1.0.0"
       },
       "devDependencies": {
+        "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
         "@types/leaflet": "^1.7.11",
         "@types/react": "^18.2.0",
         "@types/react-dom": "^18.0.5",
@@ -71,6 +72,39 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@eslint-community/eslint-plugin-eslint-comments": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.1.tgz",
+      "integrity": "sha512-lb/Z/MzbTf7CaVYM9WCFNQZ4L1yi3ev2fsFPF99h31ljhSEyUoyEsKsNWiU+qD1glbYTDJdqgyaLKtyTkkqtuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0",
+        "ignore": "^5.2.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-plugin-eslint-comments/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
diff --git a/package.json b/package.json
index ecf7ffd5..833a6fd2 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "author": "Anton Tranelis",
   "license": "MIT",
   "devDependencies": {
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
     "@types/leaflet": "^1.7.11",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.0.5",