diff --git a/packages/browser-extensions/src/libs/github/dom_functions.ts b/packages/browser-extensions/src/libs/github/dom_functions.ts
index 41ea52c03ba3..75212c717b17 100644
--- a/packages/browser-extensions/src/libs/github/dom_functions.ts
+++ b/packages/browser-extensions/src/libs/github/dom_functions.ts
@@ -197,13 +197,17 @@ export const getDiffLineRanges: CodeView['getLineRanges'] = (codeView, part) =>
 
     for (const row of codeView.querySelectorAll<HTMLTableRowElement>('tr')) {
         const isCode =
-            !row.classList.contains('js-expandable-line') && !row.classList.contains('js-inline-comments-container')
+            !row.classList.contains('js-expandable-line') &&
+            !row.classList.contains('js-inline-comments-container') &&
+            !row.querySelector('[data-line-number="..."]')
 
         if (isCode) {
             const line = row.querySelector<HTMLElement>(
                 `td${isDomSplitDiff() ? `:nth-of-type(${part === 'base' ? 2 : 4})` : '.blob-code'}`
-            )!
+            )
+
             if (
+                !line ||
                 line.classList.contains('empty-cell') ||
                 line.classList.contains(part === 'base' ? 'blob-code-addition' : 'blob-code-deletion')
             ) {