diff --git a/src/conn/patch.ts b/src/conn/patch.ts
index 2bca80a768..dcd486f63e 100644
--- a/src/conn/patch.ts
+++ b/src/conn/patch.ts
@@ -16,8 +16,8 @@
 
 import * as webpack from '../webpack';
 import { IsOfficialClient } from '../whatsapp';
-import { wrapModuleFunction } from '../whatsapp/exportModule';
-import { isLegitErrorStack } from '../whatsapp/functions';
+//import { wrapModuleFunction } from '../whatsapp/exportModule';
+//import { isLegitErrorStack } from '../whatsapp/functions';
 
 webpack.onInjected(() => {
   /**
@@ -26,8 +26,11 @@ webpack.onInjected(() => {
   IsOfficialClient.isOfficialClient = true;
 });
 
+/*
+// Commented for >= 2.3000.1015x run, i will fix soon
 webpack.onFullReady(() => {
   wrapModuleFunction(isLegitErrorStack, () => {
     return true;
   });
 }, 1000);
+*/
diff --git a/src/whatsapp/models/ChatstateModel.ts b/src/whatsapp/models/ChatstateModel.ts
index 25eec2e3e8..3ffb998056 100644
--- a/src/whatsapp/models/ChatstateModel.ts
+++ b/src/whatsapp/models/ChatstateModel.ts
@@ -61,5 +61,5 @@ exportModule(
   {
     ChatstateModel: 'Chatstate',
   },
-  (m) => m.Chatstate && m.ChatstateCollection
+  (m) => (m.Chatstate && m.ChatstateCollection) || m.Chatstate
 );
diff --git a/src/whatsapp/stores.ts b/src/whatsapp/stores.ts
index 4403d3b7ae..60077dccb2 100644
--- a/src/whatsapp/stores.ts
+++ b/src/whatsapp/stores.ts
@@ -338,3 +338,14 @@ exportModule(
   },
   (m) => m.StickerSearchCollectionImpl || m.StickerSearchCollection
 );
+
+exportModule(
+  exports,
+  {
+    BusinessProfileStore: [
+      'BusinessProfileCollectionImpl',
+      'BusinessProfileCollection',
+    ],
+  },
+  (m) => m.BusinessProfileCollectionImpl || m.BusinessProfileCollection
+);