diff --git a/chirpstack/src/gateway/backend/mqtt.rs b/chirpstack/src/gateway/backend/mqtt.rs
index c7e0ae57..9636aa83 100644
--- a/chirpstack/src/gateway/backend/mqtt.rs
+++ b/chirpstack/src/gateway/backend/mqtt.rs
@@ -1,4 +1,5 @@
 use std::collections::hash_map::DefaultHasher;
+use std::env::temp_dir;
 use std::hash::Hasher;
 use std::io::Cursor;
 use std::time::Duration;
@@ -109,6 +110,7 @@ impl<'a> MqttBackend<'a> {
                 region_name: region_name.to_string(),
                 region_common_name,
             }))
+            .persistence(mqtt::create_options::PersistenceType::FilePath(temp_dir()))
             .finalize();
         let mut client = mqtt::AsyncClient::new(create_opts).context("Create MQTT client")?;
         client.set_connected_callback(move |client| {
diff --git a/chirpstack/src/integration/mqtt.rs b/chirpstack/src/integration/mqtt.rs
index cef57708..248e2b9b 100644
--- a/chirpstack/src/integration/mqtt.rs
+++ b/chirpstack/src/integration/mqtt.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::env::temp_dir;
 use std::io::Cursor;
 use std::time::Duration;
 
@@ -81,6 +82,7 @@ impl<'a> Integration<'a> {
         let create_opts = mqtt::CreateOptionsBuilder::new()
             .server_uri(&conf.server)
             .client_id(&client_id)
+            .persistence(mqtt::create_options::PersistenceType::FilePath(temp_dir()))
             .finalize();
         let mut client = mqtt::AsyncClient::new(create_opts).context("Create MQTT client")?;
         client.set_connected_callback(move |_client| {