diff --git a/package.json b/package.json
index fd0c55f078..514d94b919 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "dependencies": {
         "@dfinity/agent": "^2.1.3",
         "@dfinity/identity-secp256k1": "^2.1.3",
+        "@sinonjs/text-encoding": "^0.7.3",
         "binaryen": "^116.0.0",
         "buffer": "^6.0.3",
         "chokidar": "^4.0.1",
diff --git a/src/lib/experimental/globals.ts b/src/lib/experimental/globals.ts
index 53d4a7a2b8..7f8d102767 100644
--- a/src/lib/experimental/globals.ts
+++ b/src/lib/experimental/globals.ts
@@ -1,9 +1,10 @@
 import './experimental';
 import '../stable/globals'; // We import this to remove type errors having to do with the stable and experimental globals
 
+// @ts-expect-error
+import { TextDecoder, TextEncoder } from '@sinonjs/text-encoding';
 import { Buffer } from 'buffer';
 import * as process from 'process';
-import { TextDecoder, TextEncoder } from 'text-encoding';
 import { URL } from 'url';
 import { v4 } from 'uuid';
 
@@ -129,7 +130,9 @@ if (globalThis._azleInsideCanister === true) {
         return match;
     };
 
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     global.Intl = require('intl');
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require('intl/locale-data/jsonp/en.js');
 }
 
diff --git a/src/lib/stable/globals.ts b/src/lib/stable/globals.ts
index 4549be163b..094d66b9be 100644
--- a/src/lib/stable/globals.ts
+++ b/src/lib/stable/globals.ts
@@ -1,5 +1,6 @@
 import { IDL } from '@dfinity/candid';
-import { TextDecoder, TextEncoder } from 'text-encoding';
+// @ts-expect-error
+import { TextDecoder, TextEncoder } from '@sinonjs/text-encoding';
 
 import { MethodMeta } from '../../build/stable/utils/types';
 import { AzleIcExperimental } from '../experimental/ic/azle_ic_experimental';
diff --git a/src/lib/stable/ic_apis/reject_code.ts b/src/lib/stable/ic_apis/reject_code.ts
index 64e2289070..2704abddde 100644
--- a/src/lib/stable/ic_apis/reject_code.ts
+++ b/src/lib/stable/ic_apis/reject_code.ts
@@ -1,5 +1,6 @@
 // TODO this should be removed once https://github.com/demergent-labs/azle/issues/2271 is resolved
-import { TextDecoder, TextEncoder } from 'text-encoding';
+// @ts-expect-error
+import { TextDecoder, TextEncoder } from '@sinonjs/text-encoding';
 globalThis.TextDecoder = TextDecoder;
 globalThis.TextEncoder = TextEncoder;
 
diff --git a/src/lib/stable/stable_structures/stable_json.ts b/src/lib/stable/stable_structures/stable_json.ts
index 9bfc0b9b34..52974a09e2 100644
--- a/src/lib/stable/stable_structures/stable_json.ts
+++ b/src/lib/stable/stable_structures/stable_json.ts
@@ -1,5 +1,6 @@
 import { Principal } from '@dfinity/principal';
-import { TextDecoder, TextEncoder } from 'text-encoding';
+// @ts-expect-error
+import { TextDecoder, TextEncoder } from '@sinonjs/text-encoding';
 
 import { Serializable } from './stable_b_tree_map';