diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
index 327558ad9f..3ac3baa9d0 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
@@ -263,7 +263,7 @@ namespace AdvancedPaste
                 if (disposing)
                 {
                     EtwTrace?.Dispose();
-                    window.Dispose();
+                    window?.Dispose();
                 }
 
                 disposedValue = true;
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
index e2c2e07c84..8d5f51314d 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
@@ -154,8 +154,8 @@ namespace AdvancedPaste.Settings
             {
                 if (disposing)
                 {
-                    _cancellationTokenSource.Dispose();
-                    _watcher.Dispose();
+                    _cancellationTokenSource?.Dispose();
+                    _watcher?.Dispose();
                 }
 
                 _disposedValue = true;