diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index cc8705345..f3cb8d810 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -5,7 +5,7 @@ import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-mana
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
 
 @Utility({
-  selector: `[${EXAM_CORRECT_IDENT}]`,
+  selector: `table[${EXAM_CORRECT_IDENT}]`,
 })
 export class ExamCorrect {
 
@@ -20,10 +20,6 @@ export class ExamCorrect {
 
     this._element = element;
 
-    if (this._element.tagName !== 'TABLE') {
-      throw new Error('Exam Correct utility can only be setup with a <table> element!');
-    }
-
   }
 
   destroy() {