diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index b5bfb8b116..c14539d7bf 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -12,7 +12,7 @@ namespace Avalonia.FreeDesktop
         /// This class uses synchronous execution at DBus connection establishment stage
         /// then switches to using AvaloniaSynchronizationContext
         /// </summary>
-        class DBusSyncContext : SynchronizationContext
+        private class DBusSyncContext : SynchronizationContext
         {
             private SynchronizationContext _ctx;
             private object _lock = new object();
diff --git a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
index 4252b9f26a..32033cb0a6 100644
--- a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
+++ b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
@@ -138,7 +138,7 @@ namespace Avalonia.FreeDesktop
 
         private void DestroyTrayIcon()
         {
-            if (_connection is null || !_serviceConnected || _isDisposed)
+            if (_connection is null || !_serviceConnected || _isDisposed || _statusNotifierItemDbusObj is null)
                 return;
 
             _connection.UnregisterObject(_statusNotifierItemDbusObj);
diff --git a/src/Avalonia.X11/X11TrayIconImpl.cs b/src/Avalonia.X11/X11TrayIconImpl.cs
index 3051e90457..93bf71b409 100644
--- a/src/Avalonia.X11/X11TrayIconImpl.cs
+++ b/src/Avalonia.X11/X11TrayIconImpl.cs
@@ -15,7 +15,6 @@ namespace Avalonia.X11
         }
 
         private readonly DBusTrayIconImpl _dBusTrayIcon;
-
         private readonly XEmbedTrayIconImpl _xEmbedTrayIcon;
         private bool _isDisposed;