diff --git a/src/Avalon.Client/HashCommands/Beep.cs b/src/Avalon.Client/HashCommands/Beep.cs
index c681760d..b9e0e5c2 100644
--- a/src/Avalon.Client/HashCommands/Beep.cs
+++ b/src/Avalon.Client/HashCommands/Beep.cs
@@ -65,11 +65,11 @@ public override void Execute()
                                                return;
                                            }
 
-                                           App.Beep.Play();
+                                           App.Beep?.Play();
 
                                            return;
                                        default:
-                                           SystemSounds.Beep.Play();
+                                           SystemSounds.Beep?.Play();
                                            return;
                                    }
                                });
diff --git a/src/Avalon.Client/MainWindow.Network.cs b/src/Avalon.Client/MainWindow.Network.cs
index 8328411f..8c51d3d3 100644
--- a/src/Avalon.Client/MainWindow.Network.cs
+++ b/src/Avalon.Client/MainWindow.Network.cs
@@ -139,7 +139,7 @@ public void HandleLineReceived(object sender, string e)
             // One beep per line max, everything else is ignored.
             if (App.Settings.ProfileSettings.AnsiBeep && e.Contains('\a'))
             {
-                App.Beep.Play();
+                App.Beep?.Play();
             }
 
             try