diff --git a/chirpstack/src/uplink/join.rs b/chirpstack/src/uplink/join.rs
index 32afb49c..895f1f35 100644
--- a/chirpstack/src/uplink/join.rs
+++ b/chirpstack/src/uplink/join.rs
@@ -257,7 +257,8 @@ impl JoinRequest {
             Err(e) => {
                 if let StorageError::NotFound(_) = e {
                     if !roaming::is_enabled() {
-                        return Err(anyhow::Error::new(e));
+                        warn!(dev_eui = %jr.dev_eui, "Unknown device");
+                        return Err(anyhow::Error::new(Error::Abort));
                     }
 
                     info!(dev_eui = %jr.dev_eui, join_eui = %jr.join_eui, "Unknown device, trying passive-roaming activation");