diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index b9c7bdf2..d6af828f 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -1457,7 +1457,7 @@ class AppWindow(object):
                     and config.get_int('output') & config.OUT_SHIP:
                 monitor.export_ship()
 
-            if monitor.cmdr and monitor.system and monitor.station:
+            if monitor.cmdr:
                 err = plug.notify_journal_entry(
                     monitor.cmdr,
                     monitor.is_beta,
@@ -1467,10 +1467,10 @@ class AppWindow(object):
                     monitor.state
                 )
 
-            if err:
-                self.status['text'] = err
-                if not config.get_int('hotkey_mute'):
-                    hotkeymgr.play_bad()
+                if err:
+                    self.status['text'] = err
+                    if not config.get_int('hotkey_mute'):
+                        hotkeymgr.play_bad()
 
             auto_update = False
             # Only if auth callback is not pending
diff --git a/plug.py b/plug.py
index 8e19a6cf..e0c69a44 100644
--- a/plug.py
+++ b/plug.py
@@ -286,7 +286,7 @@ def notify_prefs_changed(cmdr: str | None, is_beta: bool) -> None:
 
 
 def notify_journal_entry(
-    cmdr: str, is_beta: bool, system: str, station: str,
+    cmdr: str, is_beta: bool, system: str | None, station: str | None,
     entry: MutableMapping[str, Any],
     state: Mapping[str, Any]
 ) -> Optional[str]: