diff --git a/crates/defguard_common/src/db/models/device.rs b/crates/defguard_common/src/db/models/device.rs
index 31a30f0e8..71b0e295b 100644
--- a/crates/defguard_common/src/db/models/device.rs
+++ b/crates/defguard_common/src/db/models/device.rs
@@ -670,11 +670,12 @@ impl Device<Id> {
             PublicKey = {}\n\
             {allowed_ips}\
             Endpoint = {}:{}\n\
-            PersistentKeepalive = 300",
+            PersistentKeepalive = {}",
             wireguard_network_device.wireguard_ips.as_csv(),
             network.pubkey,
             network.endpoint,
             network.port,
+            network.keepalive_interval,
         )
     }
 
diff --git a/crates/defguard_core/tests/integration/api/wireguard.rs b/crates/defguard_core/tests/integration/api/wireguard.rs
index 178dbb425..b4126015f 100644
--- a/crates/defguard_core/tests/integration/api/wireguard.rs
+++ b/crates/defguard_core/tests/integration/api/wireguard.rs
@@ -568,7 +568,7 @@ async fn test_device(_: PgPoolOptions, options: PgConnectOptions) {
             PublicKey = {}\n\
             AllowedIPs = 10.1.1.0/24\n\
             Endpoint = 192.168.4.14:55555\n\
-            PersistentKeepalive = 300",
+            PersistentKeepalive = 25",
             network_from_details.pubkey
         )
     );