From 796e3012358ac7e5bca386d49c2ce711a9dc8463 Mon Sep 17 00:00:00 2001
From: Adrian-Stefan Mares <adrian.mares@thethingsindustries.com>
Date: Tue, 17 Oct 2023 17:32:05 +0200
Subject: [PATCH] tts: Erase device address on no session

---
 CHANGELOG.md           | 1 +
 pkg/source/tts/util.go | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a5a9ea..3f3d38a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 
 - Wrong flag name `appplication-server-grpc-address` fixed to `application-server-grpc-address`.
+- `--ttnv3.no-session` no longer keeps the end device device address.
 
 ### Security
 
diff --git a/pkg/source/tts/util.go b/pkg/source/tts/util.go
index eaddfe7..6ae06ba 100644
--- a/pkg/source/tts/util.go
+++ b/pkg/source/tts/util.go
@@ -110,9 +110,10 @@ func updateDeviceTimestamps(dev, src *ttnpb.EndDevice) {
 func clearDeviceSession(dev *ttnpb.EndDevice) error {
 	return dev.SetFields(nil,
 		"activated_at",
-		"mac_state",
+		"ids.dev_addr",
 		"last_dev_status_received_at",
 		"last_seen_at",
+		"mac_state",
 		"pending_mac_state",
 		"pending_session",
 		"session",