diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index e0832bbe..1a5f237d 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -674,12 +674,12 @@ class AppWindow:
                 plug.notify_system_changed(timegm(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')), monitor.system, monitor.coordinates)
 
             # Auto-Update after docking
-            if station_changed and not monitor.is_beta and not config.getint('output') & config.OUT_MKT_MANUAL and config.getint('output') & config.OUT_STATION_ANY:
+            if station_changed and monitor.mode and not monitor.is_beta and not config.getint('output') & config.OUT_MKT_MANUAL and config.getint('output') & config.OUT_STATION_ANY:
                 self.w.after(int(SERVER_RETRY * 1000), self.getandsend)
 
             # Send interesting events to EDDN
             try:
-                if (config.getint('output') & config.OUT_SYS_EDDN and monitor.cmdr and
+                if (config.getint('output') & config.OUT_SYS_EDDN and monitor.cmdr and monitor.mode and
                     (entry['event'] == 'FSDJump' or
                      entry['event'] == 'Docked'  or
                      entry['event'] == 'Scan'    and monitor.system and monitor.coordinates)):
diff --git a/monitor.py b/monitor.py
index ad3fc4d5..dfa5a949 100644
--- a/monitor.py
+++ b/monitor.py
@@ -326,7 +326,7 @@ class EDLogs(FileSystemEventHandler):
             elif entry['event'] == 'LoadGame':
                 self.live = True
                 self.cmdr = entry['Commander']
-                self.mode = entry.get('GameMode')	# 'Open', 'Solo', 'Group', or None for CQC
+                self.mode = entry.get('GameMode')	# 'Open', 'Solo', 'Group', or None for CQC (and Training - but no LoadGame event)
                 self.group = entry.get('Group')
                 self.state.update({
                     'Credits'      : entry['Credits'],