diff --git a/package.json b/package.json
index bc8c1835..7d2bb287 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.1",
         "zigbee-herdsman": "3.2.7",
-        "zigbee-herdsman-converters": "23.0.0",
+        "zigbee-herdsman-converters": "23.1.0",
         "zigbee2mqtt-frontend": "0.9.4"
     },
     "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 549c6b1e..2f0267b5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -81,8 +81,8 @@ importers:
         specifier: 3.2.7
         version: 3.2.7
       zigbee-herdsman-converters:
-        specifier: 23.0.0
-        version: 23.0.0
+        specifier: 23.1.0
+        version: 23.1.0
       zigbee2mqtt-frontend:
         specifier: 0.9.4
         version: 0.9.4
@@ -1835,8 +1835,8 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  zigbee-herdsman-converters@23.0.0:
-    resolution: {integrity: sha512-nl1SfypQ4QRAPUx8A2FxuBc5+NWtsf7NOJoY0WT5l92JdGtUbiS9gUq6Q+yRARksJmhtEc1byX9hPNGg+P1OTA==}
+  zigbee-herdsman-converters@23.1.0:
+    resolution: {integrity: sha512-jZp+aFTFDAGWzSS3scDxV7boUzE3Z4HFAIIkXlmWui3RyYkw8Zbf0DBj7URC2XvsnLDtG+EBS4Hk++j8V6w54A==}
 
   zigbee-herdsman@3.2.7:
     resolution: {integrity: sha512-089/Ffj63VvzjhXoDpxTChRDHL1ADHHBfoyvPiQ0iiA34/A3uR7ynRhzrCFdEt3l8vswoFdzsOqX1AWM3Efizw==}
@@ -3504,7 +3504,7 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  zigbee-herdsman-converters@23.0.0:
+  zigbee-herdsman-converters@23.1.0:
     dependencies:
       buffer-crc32: 1.0.0
       iconv-lite: 0.6.3
diff --git a/test/extensions/groups.test.ts b/test/extensions/groups.test.ts
index 199fbe62..2f09f183 100644
--- a/test/extensions/groups.test.ts
+++ b/test/extensions/groups.test.ts
@@ -6,7 +6,7 @@ import {devices, groups, events as mockZHEvents, resetGroupMembers, returnDevice
 
 import stringify from 'json-stable-stringify-without-jsonify';
 
-import {toZigbee as zhcToZigbee} from 'zigbee-herdsman-converters';
+import * as zhcGlobalStore from 'zigbee-herdsman-converters/lib/store';
 
 import {Controller} from '../../lib/controller';
 import * as settings from '../../lib/util/settings';
@@ -42,7 +42,7 @@ describe('Extension: Groups', () => {
         settings.reRead();
         mockMQTTPublishAsync.mockClear();
         groups.gledopto_group.command.mockClear();
-        zhcToZigbee.__clearStore__();
+        zhcGlobalStore.clear();
         // @ts-expect-error private
         controller.state.state = {};
     });
diff --git a/test/extensions/publish.test.ts b/test/extensions/publish.test.ts
index f6f97c4d..38788270 100644
--- a/test/extensions/publish.test.ts
+++ b/test/extensions/publish.test.ts
@@ -7,7 +7,7 @@ import {devices, groups, events as mockZHEvents} from '../mocks/zigbeeHerdsman';
 
 import stringify from 'json-stable-stringify-without-jsonify';
 
-import {toZigbee} from 'zigbee-herdsman-converters';
+import * as zhcGlobalStore from 'zigbee-herdsman-converters/lib/store';
 
 import {Controller} from '../../lib/controller';
 import {loadTopicGetSetRegex} from '../../lib/extension/publish';
@@ -58,7 +58,7 @@ describe('Extension: Publish', () => {
             g.command.mockClear();
         });
 
-        toZigbee.__clearStore__();
+        zhcGlobalStore.clear();
     });
 
     afterAll(async () => {
@@ -1511,7 +1511,7 @@ describe('Extension: Publish', () => {
         await mockMQTTEvents.message('zigbee2mqtt/bulb_color/set', stringify({state: 'ON', brightness: 20, transition: 0.0}));
         await flushPromises();
 
-        toZigbee.__clearStore__();
+        zhcGlobalStore.clear();
 
         await mockMQTTEvents.message('zigbee2mqtt/bulb_color/set', stringify({state: 'ON', transition: 1.0}));
         await flushPromises();