diff --git a/plugins/edsm.py b/plugins/edsm.py
index 0f6ed269..f4118f56 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -382,6 +382,12 @@ def journal_entry(
         this.station = None
         this.station_marketid = None
 
+    if entry['event'] == 'Embark' and not entry.get('OnStation'):
+        # If we're embarking OnStation to a Taxi/Dropship we'll also get an
+        # Undocked event.
+        this.station = None
+        this.station_marketid = None
+
     if config.get_str('station_provider') == 'EDSM':
         to_set = this.station
         if not this.station:
diff --git a/plugins/inara.py b/plugins/inara.py
index 28b19959..c8110ff0 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -395,6 +395,12 @@ def journal_entry(  # noqa: C901, CCR001
         this.station = None
         this.station_marketid = None
 
+    if entry['event'] == 'Embark' and not entry.get('OnStation'):
+        # If we're embarking OnStation to a Taxi/Dropship we'll also get an
+        # Undocked event.
+        this.station = None
+        this.station_marketid = None
+
     if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(cmdr):
         current_creds = Credentials(this.cmdr, this.FID, str(credentials(this.cmdr)))
         try: