diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 25af6613..25ae6c54 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -529,7 +529,7 @@ class AppWindow:
             if (config.getint('output') & config.OUT_SYS_EDDN and monitor.cmdr and
                 (entry['event'] == 'FSDJump' and system_changed  or
                  entry['event'] == 'Docked'  and station_changed or
-                 entry['event'] == 'Scan')):
+                 entry['event'] == 'Scan'    and monitor.system)):
                 try:
                     self.status['text'] = _('Sending data to EDDN...')
 
@@ -540,6 +540,10 @@ class AppWindow:
                         if thing.endswith('_Localised'):
                             entry.pop(thing, None)
 
+                    # add mandatory StarSystem property to Scan events
+                    if 'StarSystem' not in entry:
+                        entry['StarSystem'] = monitor.system
+
                     eddn.export_journal_entry(monitor.cmdr, monitor.is_beta, entry)
                     self.status['text'] = ''