diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index d81e6e1364..47f0bdd3cd 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -1,7 +1,7 @@
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
-module.exports = {
+const config = module.exports = {
 	parser: '@typescript-eslint/parser',
 	parserOptions: {
 		sourceType: 'module',
@@ -34,13 +34,6 @@ module.exports = {
 		 */
 		'eslint-plugin-prettier',
 
-		/**
-		 * Plugin to lint only changes
-		 *
-		 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
-		 */
-		'eslint-plugin-diff',
-
 		/*
 		 * Plugin to allow specifying local ESLint rules.
 		 * https://github.com/ivov/eslint-plugin-n8n-local-rules
@@ -77,13 +70,6 @@ module.exports = {
 		 * https://github.com/prettier/eslint-config-prettier
 		 */
 		'eslint-config-prettier',
-
-		/**
-		 * Config for eslint-plugin-diff
-		 *
-		 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
-		 */
-		'plugin:diff/diff',
 	],
 
 	rules: {
@@ -385,3 +371,19 @@ module.exports = {
 		'import/prefer-default-export': 'off',
 	},
 };
+
+if ('ESLINT_PLUGIN_DIFF_COMMIT' in process.env) {
+	/**
+	 * Plugin to lint only changes
+	 *
+	 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
+	 */
+	config.plugins.push('eslint-plugin-diff');
+
+	/**
+	 * Config for eslint-plugin-diff
+	 *
+	 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
+	 */
+	config.extends.push('plugin:diff/diff');
+}