diff --git a/src/app/component/comment/comment.component.ts b/src/app/component/comment/comment.component.ts
index 8f1c2c970..502f3b9a7 100644
--- a/src/app/component/comment/comment.component.ts
+++ b/src/app/component/comment/comment.component.ts
@@ -121,9 +121,9 @@ export class CommentComponent implements OnInit, AfterViewInit, OnChanges, OnDes
   }
 
   saveChanges() {
-    return !!this.editComponent?.saveChanges()
-      && !!this.replyComponent?.saveChanges()
-      && !!this.threadComponent?.saveChanges();
+    return (!this.editComponent || this.editComponent.saveChanges())
+      && (!this.replyComponent || this.replyComponent.saveChanges())
+      && (!this.threadComponent || this.threadComponent.saveChanges());
   }
 
   ngOnInit(): void {
diff --git a/src/app/component/graph/force-directed/force-directed.component.ts b/src/app/component/graph/force-directed/force-directed.component.ts
index a07185f3d..5090cc476 100644
--- a/src/app/component/graph/force-directed/force-directed.component.ts
+++ b/src/app/component/graph/force-directed/force-directed.component.ts
@@ -122,7 +122,7 @@ export class ForceDirectedComponent implements AfterViewInit, OnDestroy, HasChan
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnDestroy() {
diff --git a/src/app/component/ref/ref.component.ts b/src/app/component/ref/ref.component.ts
index 779777053..1ee2f586f 100644
--- a/src/app/component/ref/ref.component.ts
+++ b/src/app/component/ref/ref.component.ts
@@ -212,7 +212,7 @@ export class RefComponent implements OnChanges, AfterViewInit, OnDestroy, HasCha
 
   saveChanges() {
     return (!this.editing || !this.editForm.dirty)
-      && (!this.replying || !!this.reply?.saveChanges());
+      && (!this.reply || this.reply.saveChanges());
   }
 
   init() {
diff --git a/src/app/guard/pending-changes.guard.ts b/src/app/guard/pending-changes.guard.ts
index 4e7d76831..06ffb8e8c 100644
--- a/src/app/guard/pending-changes.guard.ts
+++ b/src/app/guard/pending-changes.guard.ts
@@ -6,5 +6,5 @@ export interface HasChanges {
 
 export const pendingChangesGuard: CanDeactivateFn<HasChanges> = (component, currentRoute, currentState, nextState) => {
   if (!component?.saveChanges || component.saveChanges()) return true;
-   return confirm($localize`Discard draft?`);
+  return confirm($localize`Discard draft?`);
 };
diff --git a/src/app/page/home/home.component.ts b/src/app/page/home/home.component.ts
index 78b4d713b..7fb8b3b19 100644
--- a/src/app/page/home/home.component.ts
+++ b/src/app/page/home/home.component.ts
@@ -40,7 +40,7 @@ export class HomePage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.lens?.saveChanges();
+    return !this.lens || this.lens.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/alarms/alarms.component.ts b/src/app/page/inbox/alarms/alarms.component.ts
index 8d87bbdbd..57eeb335b 100644
--- a/src/app/page/inbox/alarms/alarms.component.ts
+++ b/src/app/page/inbox/alarms/alarms.component.ts
@@ -35,7 +35,7 @@ export class InboxAlarmsPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/all/all.component.ts b/src/app/page/inbox/all/all.component.ts
index 696cb743c..20ac7af27 100644
--- a/src/app/page/inbox/all/all.component.ts
+++ b/src/app/page/inbox/all/all.component.ts
@@ -35,7 +35,7 @@ export class InboxAllPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/dms/dms.component.ts b/src/app/page/inbox/dms/dms.component.ts
index a989044b8..6b94b7a18 100644
--- a/src/app/page/inbox/dms/dms.component.ts
+++ b/src/app/page/inbox/dms/dms.component.ts
@@ -35,7 +35,7 @@ export class InboxDmsPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/modlist/modlist.component.ts b/src/app/page/inbox/modlist/modlist.component.ts
index 72365169e..ab7cf58ba 100644
--- a/src/app/page/inbox/modlist/modlist.component.ts
+++ b/src/app/page/inbox/modlist/modlist.component.ts
@@ -37,7 +37,7 @@ export class InboxModlistPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/ref/ref.component.ts b/src/app/page/inbox/ref/ref.component.ts
index 37c12c28b..71aeaf4b7 100644
--- a/src/app/page/inbox/ref/ref.component.ts
+++ b/src/app/page/inbox/ref/ref.component.ts
@@ -37,7 +37,7 @@ export class InboxRefPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/reports/reports.component.ts b/src/app/page/inbox/reports/reports.component.ts
index d339462e8..426d9d0be 100644
--- a/src/app/page/inbox/reports/reports.component.ts
+++ b/src/app/page/inbox/reports/reports.component.ts
@@ -37,7 +37,7 @@ export class InboxReportsPage  implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/inbox/sent/sent.component.ts b/src/app/page/inbox/sent/sent.component.ts
index 4a2ecc597..90961f4e6 100644
--- a/src/app/page/inbox/sent/sent.component.ts
+++ b/src/app/page/inbox/sent/sent.component.ts
@@ -35,7 +35,7 @@ export class InboxSentPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/alts/alts.component.ts b/src/app/page/ref/alts/alts.component.ts
index 21ad8fae1..72aea25e4 100644
--- a/src/app/page/ref/alts/alts.component.ts
+++ b/src/app/page/ref/alts/alts.component.ts
@@ -37,7 +37,7 @@ export class RefAltsComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/comments/comments.component.ts b/src/app/page/ref/comments/comments.component.ts
index e79890d2c..a51122f76 100644
--- a/src/app/page/ref/comments/comments.component.ts
+++ b/src/app/page/ref/comments/comments.component.ts
@@ -37,7 +37,7 @@ export class RefCommentsComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.reply?.saveChanges();
+    return !this.reply || this.reply.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/errors/errors.component.ts b/src/app/page/ref/errors/errors.component.ts
index fb457b1b7..6885d1894 100644
--- a/src/app/page/ref/errors/errors.component.ts
+++ b/src/app/page/ref/errors/errors.component.ts
@@ -48,7 +48,7 @@ export class RefErrorsComponent implements HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/responses/responses.component.ts b/src/app/page/ref/responses/responses.component.ts
index dafe7c9e8..a5cd5836f 100644
--- a/src/app/page/ref/responses/responses.component.ts
+++ b/src/app/page/ref/responses/responses.component.ts
@@ -33,7 +33,7 @@ export class RefResponsesComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/sources/sources.component.ts b/src/app/page/ref/sources/sources.component.ts
index f5ad676bf..7508f0969 100644
--- a/src/app/page/ref/sources/sources.component.ts
+++ b/src/app/page/ref/sources/sources.component.ts
@@ -37,7 +37,7 @@ export class RefSourcesComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/summary/summary.component.ts b/src/app/page/ref/summary/summary.component.ts
index 2928e1b3c..5dfbe5a9e 100644
--- a/src/app/page/ref/summary/summary.component.ts
+++ b/src/app/page/ref/summary/summary.component.ts
@@ -54,8 +54,8 @@ export class RefSummaryComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.reply?.saveChanges()
-      && !!this.list?.saveChanges()
+    return (!this.reply || this.reply.saveChanges())
+      && (!this.list || this.list.saveChanges())
       && !this.threadComponents?.find(t => !t.saveChanges());
   }
 
diff --git a/src/app/page/ref/thread/thread.component.ts b/src/app/page/ref/thread/thread.component.ts
index d37a93526..295ab486d 100644
--- a/src/app/page/ref/thread/thread.component.ts
+++ b/src/app/page/ref/thread/thread.component.ts
@@ -55,7 +55,8 @@ export class RefThreadComponent implements HasChanges {
   }
 
   saveChanges() {
-    return !!this.reply?.saveChanges() && !!this.list?.saveChanges();
+    return (!this.reply || this.reply.saveChanges())
+      && (!this.list || this.list.saveChanges());
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/ref/versions/versions.component.ts b/src/app/page/ref/versions/versions.component.ts
index da00679f4..717dc4a13 100644
--- a/src/app/page/ref/versions/versions.component.ts
+++ b/src/app/page/ref/versions/versions.component.ts
@@ -33,7 +33,7 @@ export class RefVersionsComponent implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/settings/plugin/plugin.component.ts b/src/app/page/settings/plugin/plugin.component.ts
index db3c5da05..7324d1684 100644
--- a/src/app/page/settings/plugin/plugin.component.ts
+++ b/src/app/page/settings/plugin/plugin.component.ts
@@ -42,7 +42,7 @@ export class SettingsPluginPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/settings/ref/ref.component.ts b/src/app/page/settings/ref/ref.component.ts
index cea7992b0..3a6794e7c 100644
--- a/src/app/page/settings/ref/ref.component.ts
+++ b/src/app/page/settings/ref/ref.component.ts
@@ -39,7 +39,7 @@ export class SettingsRefPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/settings/template/template.component.ts b/src/app/page/settings/template/template.component.ts
index ee29387b7..fd7028950 100644
--- a/src/app/page/settings/template/template.component.ts
+++ b/src/app/page/settings/template/template.component.ts
@@ -41,7 +41,7 @@ export class SettingsTemplatePage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/settings/user/user.component.ts b/src/app/page/settings/user/user.component.ts
index bb017bff8..0d5165d34 100644
--- a/src/app/page/settings/user/user.component.ts
+++ b/src/app/page/settings/user/user.component.ts
@@ -39,7 +39,7 @@ export class SettingsUserPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {
diff --git a/src/app/page/tag/tag.component.ts b/src/app/page/tag/tag.component.ts
index 1de0cb0cc..98cf5b480 100644
--- a/src/app/page/tag/tag.component.ts
+++ b/src/app/page/tag/tag.component.ts
@@ -63,7 +63,7 @@ export class TagPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.lens?.saveChanges();
+    return !this.lens || this.lens.saveChanges();
   }
 
   ngOnInit() {
diff --git a/src/app/page/tags/tags.component.ts b/src/app/page/tags/tags.component.ts
index 66357c273..6e2bdf9a5 100644
--- a/src/app/page/tags/tags.component.ts
+++ b/src/app/page/tags/tags.component.ts
@@ -44,7 +44,7 @@ export class TagsPage implements OnInit, OnDestroy, HasChanges {
   }
 
   saveChanges() {
-    return !!this.list?.saveChanges();
+    return !this.list || this.list.saveChanges();
   }
 
   ngOnInit(): void {