diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
index 4b5615dccf..ef7ab3fdac 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
@@ -57,9 +57,9 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
 
 	private final MqttPahoClientFactory clientFactory;
 
-	private volatile long completionTimeout = DEFAULT_COMPLETION_TIMEOUT;
+	private int recoveryInterval = DEFAULT_RECOVERY_INTERVAL;
 
-	private volatile int recoveryInterval = DEFAULT_RECOVERY_INTERVAL;
+	private volatile long completionTimeout = DEFAULT_COMPLETION_TIMEOUT;
 
 	private volatile IMqttClient client;
 
@@ -128,7 +128,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
 	 * @param recoveryInterval the interval.
 	 * @since 4.2.2
 	 */
-	public void setRecoveryInterval(int recoveryInterval) {
+	public synchronized void setRecoveryInterval(int recoveryInterval) {
 		this.recoveryInterval = recoveryInterval;
 	}