diff --git a/app/helpers/github-link.js b/app/helpers/github-link.js
index 807f54b3..c23247d6 100644
--- a/app/helpers/github-link.js
+++ b/app/helpers/github-link.js
@@ -8,10 +8,24 @@ export function githubLink([project, version, file, line], { isEdit = false }) {
       version
     )}${file}#L${line}`;
   }
+
+  // This 'packages' replacement can be removed if the following PR goes into a patch release of
+  // Ember Data 4.12: https://github.com/emberjs/data/pull/8598/files
+  //
+  // If the file has packages already in the path, make sure we don't
+  // add duplicate packages via the mainDir function.
+  // Fixes an issue with ember data URLS having an incorrect
+  // 'packages/packages' in the GitHub source URL
+  // For example, without this fixedFile line, a `file` with value
+  // '../packages/store/addon/-private/record-arrays/identifier-array.ts'
+  // would become
+  // 'https://github.com/emberjs/data/tree/v4.10.0/packages/packages/store/addon/-private/record-arrays/identifier-array.ts#L118'
+  const fixedFile = file?.replace('../packages/', '../');
+
   return `https://github.com/${githubMap[project]}/tree/v${version}${mainDir(
     project,
     version
-  )}${file}#L${line}`;
+  )}${fixedFile}#L${line}`;
 }
 
 export default helper(githubLink);