diff --git a/.goreleaser.release.yml b/.goreleaser.release.yml
index b42ad6f330..97747764b7 100644
--- a/.goreleaser.release.yml
+++ b/.goreleaser.release.yml
@@ -120,10 +120,14 @@ snapcrafts:
         plugs: [home, network, network-bind]
         command: ttn-lw-stack.wrapper
         completer: config/completion/bash/ttn-lw-stack
+        environment:
+          XDG_CACHE_HOME: $SNAP_USER_COMMON
       ttn-lw-cli:
         plugs: [home, network, network-bind]
         command: ttn-lw-cli.wrapper
         completer: config/completion/bash/ttn-lw-cli-snap
+        environment:
+          XDG_CACHE_HOME: $SNAP_USER_COMMON
 
 brews:
   - name: ttn-lw-stack
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a7529a63..4427269418 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ For details about compatibility between different releases, see the **Commitment
 - Listing deleted entities is now fixed for both admin and standard users, which previously returned an `account_not_found` error.
 - Update to an user's `PrimaryEmailAddress` via a non admin now invalidates the `PrimaryEmailAddressValidatedAt` as it was intended.
 - Negative number support in Cayenne LPP.
+- Fix panic in snapcraft CLI deployment, commands will no longer generate a panic error message when telemetry is enabled.
 
 ### Security