diff --git a/owrx/js8.py b/owrx/js8.py
index 167b3f177..412a94ccd 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -102,13 +102,12 @@ def parse(self, profile: AudioChopperProfile, freq: int, raw_msg: bytes):
             self.pushDecode(band)
 
             if (isinstance(frame, Js8FrameHeartbeat) or isinstance(frame, Js8FrameCompound)) and frame.grid:
-                callsign = frame.source["callsign"]
                 Map.getSharedInstance().updateLocation(
-                    callsign, LocatorLocation(frame.grid), "JS8", band
+                    frame.callsign, LocatorLocation(frame.grid), "JS8", band
                 )
                 ReportingEngine.getSharedInstance().spot(
                     {
-                        "callsign": callsign,
+                        "callsign": frame.callsign,
                         "mode": "JS8",
                         "locator": frame.grid,
                         "freq": freq + frame.freq,