diff --git a/server/incoming_spa.c b/server/incoming_spa.c
index 02d69abf..5b0f12a3 100644
--- a/server/incoming_spa.c
+++ b/server/incoming_spa.c
@@ -871,12 +871,13 @@ add_replay_cache(fko_srv_options_t *opts, acc_stanza_t *acc,
 static void
 set_timeout(acc_stanza_t *acc, spa_data_t *spadat)
 {
+    spadat->fw_access_timeout = DEF_FW_ACCESS_TIMEOUT;
+
     if(spadat->client_timeout > 0)
         spadat->fw_access_timeout = spadat->client_timeout;
     else if(acc->fw_access_timeout > 0)
         spadat->fw_access_timeout = acc->fw_access_timeout;
-    else
-        spadat->fw_access_timeout = DEF_FW_ACCESS_TIMEOUT;
+
     return;
 }