diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index 209da3a4..00873fb5 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -2068,6 +2068,9 @@ class DATA:
         self.mycallsign = mycallsign
         self.dxcallsign = dxcallsign
 
+        Station.dxcallsign = dxcallsign
+        Station.dxcallsign_crc = helpers.get_crc_24(Station.dxcallsign)
+
         # override session connection attempts
         self.data_channel_max_retries = attempts
 
diff --git a/tnc/sock.py b/tnc/sock.py
index 419cdfc2..39e6dd15 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -684,8 +684,7 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
                 # then we are forcing a station ssid = 0
                 dxcallsign = helpers.callsign_to_bytes(dxcallsign)
                 dxcallsign = helpers.bytes_to_callsign(dxcallsign)
-                Station.dxcallsign = dxcallsign
-                Station.dxcallsign_crc = helpers.get_crc_24(Station.dxcallsign)
+
                 command_response("send_raw", True)
             else:
                 dxcallsign = Station.dxcallsign