diff --git a/api/lib/Gateway.ts b/api/lib/Gateway.ts
index 453c0006e08..bd19660d048 100644
--- a/api/lib/Gateway.ts
+++ b/api/lib/Gateway.ts
@@ -1660,7 +1660,11 @@ export default class Gateway {
 					break
 				}
 				case CommandClasses.Configuration: {
-					if (!valueId.writeable) {
+					if (
+						!valueId.writeable ||
+						process.env.DISCOVERY_DISABLE_CC_CONFIGURATION ===
+							'true'
+					) {
 						return
 					}
 					let type = valueId.type
diff --git a/docs/guide/env-vars.md b/docs/guide/env-vars.md
index cf6613330ac..6bd12185a42 100644
--- a/docs/guide/env-vars.md
+++ b/docs/guide/env-vars.md
@@ -32,3 +32,4 @@ This is the list of the supported environment variables:
 - `UID_DISCOVERY_PREFIX`: Sets the prefix used for MQTT Discovery `unique_id` of entities. Default is `zwavejs2mqtt_`.
 - `TZ`: Set this env var to the timezone you want to use on UI. Default to browser TZ.
 - `LOCALE`: Set this env var to the locale you want to use on UI. Default to browser locale.
+- `DISCOVERY_DISABLE_CC_CONFIGURATION`: Set this env var to `'true'` to disable Configuration CC MQTT Discovery.