diff --git a/plugins/eddn.py b/plugins/eddn.py
index ff88b1da..8d40262e 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -1045,6 +1045,12 @@ class EDDN:
         #######################################################################
         # Augmentations
         #######################################################################
+        # In this case should add StarPos, but only if the
+        # SystemAddress of where we think we are matches.
+        if this.systemaddress is None or this.systemaddress != entry['SystemAddress']:
+            logger.warning("SystemAddress isn't current location! Can't add augmentations!")
+            return 'Wrong System! Missed jump ?'
+
         ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem'], system_starpos)
         if isinstance(ret, str):
             return ret