diff --git a/ts/.eslintrc.js b/ts/.eslintrc.js
index ef8cdf3ff..9ac39c7ab 100644
--- a/ts/.eslintrc.js
+++ b/ts/.eslintrc.js
@@ -11,6 +11,7 @@ module.exports = {
         "prefer-const": "warn",
         "no-nested-ternary": "warn",
         "@typescript-eslint/ban-ts-comment": "warn",
+        "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-unused-vars": [
             "warn",
             { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
diff --git a/ts/change-notetype/lib.ts b/ts/change-notetype/lib.ts
index 3bc334a03..37a97c5bc 100644
--- a/ts/change-notetype/lib.ts
+++ b/ts/change-notetype/lib.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 import { Notetypes } from "../lib/proto";
 import { postRequest } from "../lib/postrequest";
 import { readable, Readable } from "svelte/store";
diff --git a/ts/deck-options/TextInputModal.svelte b/ts/deck-options/TextInputModal.svelte
index 6ff079e2b..3ee08523e 100644
--- a/ts/deck-options/TextInputModal.svelte
+++ b/ts/deck-options/TextInputModal.svelte
@@ -3,9 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    /* eslint
-    @typescript-eslint/no-non-null-assertion: "off",
-    */
     import { onMount, onDestroy, getContext } from "svelte";
     import { nightModeKey, modalsKey } from "../components/context-keys";
     import Modal from "bootstrap/js/dist/modal";
diff --git a/ts/deck-options/lib.ts b/ts/deck-options/lib.ts
index 679cfebc9..fd1e1a922 100644
--- a/ts/deck-options/lib.ts
+++ b/ts/deck-options/lib.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 import { DeckConfig } from "../lib/proto";
 import { postRequest } from "../lib/postrequest";
 import { Writable, writable, get, Readable, readable } from "svelte/store";
diff --git a/ts/editable/mathjax-element.ts b/ts/editable/mathjax-element.ts
index 81ddac408..22dbf7698 100644
--- a/ts/editable/mathjax-element.ts
+++ b/ts/editable/mathjax-element.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/editor/index.ts b/ts/editor/index.ts
index 920f446bc..d53cc4d85 100644
--- a/ts/editor/index.ts
+++ b/ts/editor/index.ts
@@ -5,7 +5,6 @@ import "./legacy.css";
 import "./editor-base.css";
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/added.ts b/ts/graphs/added.ts
index c0c01ced4..a693f401a 100644
--- a/ts/graphs/added.ts
+++ b/ts/graphs/added.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/buttons.ts b/ts/graphs/buttons.ts
index ced410fda..4ecce55d7 100644
--- a/ts/graphs/buttons.ts
+++ b/ts/graphs/buttons.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/calendar.ts b/ts/graphs/calendar.ts
index 746532f27..209a1510c 100644
--- a/ts/graphs/calendar.ts
+++ b/ts/graphs/calendar.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 import { Stats } from "../lib/proto";
 import {
     interpolateBlues,
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 1d5b1e50e..837aa5017 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/ease.ts b/ts/graphs/ease.ts
index ca3b6337d..ea38bc57b 100644
--- a/ts/graphs/ease.ts
+++ b/ts/graphs/ease.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/future-due.ts b/ts/graphs/future-due.ts
index 8c17eddd3..6c208cf51 100644
--- a/ts/graphs/future-due.ts
+++ b/ts/graphs/future-due.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index 59e93a04f..0ce25555e 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
 @typescript-eslint/ban-ts-comment: "off" */
 
diff --git a/ts/graphs/histogram-graph.ts b/ts/graphs/histogram-graph.ts
index 7b5dedd64..5b32b00f4 100644
--- a/ts/graphs/histogram-graph.ts
+++ b/ts/graphs/histogram-graph.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/hours.ts b/ts/graphs/hours.ts
index e01e915f9..404fc7102 100644
--- a/ts/graphs/hours.ts
+++ b/ts/graphs/hours.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/intervals.ts b/ts/graphs/intervals.ts
index 915206a42..4282dca99 100644
--- a/ts/graphs/intervals.ts
+++ b/ts/graphs/intervals.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/graphs/reviews.ts b/ts/graphs/reviews.ts
index 88b480b19..b3863823b 100644
--- a/ts/graphs/reviews.ts
+++ b/ts/graphs/reviews.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/lib/dom.ts b/ts/lib/dom.ts
index be51ac731..0a9b26c32 100644
--- a/ts/lib/dom.ts
+++ b/ts/lib/dom.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 export function nodeIsElement(node: Node): node is Element {
     return node.nodeType === Node.ELEMENT_NODE;
 }
diff --git a/ts/lib/promise.ts b/ts/lib/promise.ts
index f99e8169c..60624dd9d 100644
--- a/ts/lib/promise.ts
+++ b/ts/lib/promise.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 export function promiseWithResolver<T>(): [Promise<T>, (value: T) => void] {
     let resolve: (object: T) => void;
     const promise = new Promise<T>((res) => (resolve = res));
diff --git a/ts/lib/wrap.ts b/ts/lib/wrap.ts
index 0e7d73ee3..e4e14030b 100644
--- a/ts/lib/wrap.ts
+++ b/ts/lib/wrap.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
- */
-
 function wrappedExceptForWhitespace(text: string, front: string, back: string): string {
     const match = text.match(/^(\s*)([^]*?)(\s*)$/)!;
     return match[1] + front + match[2] + back + match[3];
diff --git a/ts/reviewer/index.ts b/ts/reviewer/index.ts
index 97f8707d1..b2b335515 100644
--- a/ts/reviewer/index.ts
+++ b/ts/reviewer/index.ts
@@ -2,7 +2,6 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 /* eslint
-@typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
  */
 
diff --git a/ts/sveltelib/node-store.ts b/ts/sveltelib/node-store.ts
index c5b64ede8..e78f20c25 100644
--- a/ts/sveltelib/node-store.ts
+++ b/ts/sveltelib/node-store.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-/* eslint
-@typescript-eslint/no-non-null-assertion: "off",
-*/
-
 import type { Writable, Subscriber, Unsubscriber, Updater } from "svelte/store";
 import { noop } from "../lib/functional";