diff --git a/src/transformation/utils/function-context.ts b/src/transformation/utils/function-context.ts
index 5b2c0cb4e..d61ffb5bf 100644
--- a/src/transformation/utils/function-context.ts
+++ b/src/transformation/utils/function-context.ts
@@ -124,7 +124,8 @@ function computeDeclarationContextType(context: TransformationContext, signature
         ts.isConstructSignatureDeclaration(signatureDeclaration) ||
         ts.isConstructorDeclaration(signatureDeclaration) ||
         (signatureDeclaration.parent && ts.isPropertyDeclaration(signatureDeclaration.parent)) ||
-        (signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent))
+        (signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent)) ||
+        (signatureDeclaration.parent && ts.isIndexSignatureDeclaration(signatureDeclaration.parent))
     ) {
         // Class/interface methods only respect @noSelf on their parent
         const scopeDeclaration = findFirstNodeAbove(
diff --git a/test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap b/test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap
index f4e5fdd6d..64eb65457 100644
--- a/test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap
+++ b/test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap
@@ -13,3 +13,8 @@ exports[`@noSelf on parent class declaration removes context argument 1`] = `"ho
 exports[`@noSelf on parent interface declaration removes context argument 1`] = `"holder.myMethod()"`;
 
 exports[`@noSelf on parent namespace declaration removes context argument 1`] = `"MyNamespace.myMethod()"`;
+
+exports[`@noSelf on static class methods with string key access 1`] = `
+"TestClass.myMethod()
+TestClass.myKey()"
+`;
diff --git a/test/unit/functions/noSelfAnnotation.spec.ts b/test/unit/functions/noSelfAnnotation.spec.ts
index b25742a11..f8418fabd 100644
--- a/test/unit/functions/noSelfAnnotation.spec.ts
+++ b/test/unit/functions/noSelfAnnotation.spec.ts
@@ -52,6 +52,19 @@ test("@noSelf on parent namespace declaration removes context argument", () => {
     `.expectLuaToMatchSnapshot();
 });
 
+test("@noSelf on static class methods with string key access", () => {
+    util.testModule`
+        /** @noSelf */
+        declare class TestClass {
+            static [key: string]: () => void;
+            static myMethod(): void;
+        }
+
+        TestClass.myMethod();
+        TestClass.myKey();
+    `.expectLuaToMatchSnapshot();
+});
+
 // additional coverage for https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1292
 test("explicit this parameter respected over @noSelf", () => {
     util.testModule`