diff --git a/src/uas/UASParameterCommsMgr.cc b/src/uas/UASParameterCommsMgr.cc
index 90b2f1c1d5fb5828da4fd404753480ac77dd3f35..abe2072cbcc5992b1796a80993c6b83ba2b4fa84 100644
--- a/src/uas/UASParameterCommsMgr.cc
+++ b/src/uas/UASParameterCommsMgr.cc
@@ -218,10 +218,6 @@ void UASParameterCommsMgr::resendReadWriteRequests()
             setRetransmissionGuardEnabled(false);
             transmissionActive = false;
         }
-        if (persistParamsAfterSend) {
-            writeParamsToPersistentStorage();
-            persistParamsAfterSend = false;
-        }
     }
     else {
         //restart the timer now that we've sent
@@ -505,6 +501,10 @@ void UASParameterCommsMgr::receivedParameterUpdate(int uas, int compId, int para
             setParameterStatusMsg(tr("SUCCESS: Wrote %2 (#%1/%4): %3 [%5]").arg(paramId+1).arg(paramName).arg(value.toDouble()).arg(paramCount).arg(missWriteCount));
             if (0 == missWriteCount) {
                 setParameterStatusMsg(tr("SUCCESS: WROTE ALL PARAMETERS"));
+                if (persistParamsAfterSend) {
+                    writeParamsToPersistentStorage();
+                    persistParamsAfterSend = false;
+                }
             }
         }
         else  {