diff --git a/ChangeLog.txt b/ChangeLog.txt
index 81bf20c8..e89fe76c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -18,6 +18,8 @@ Broker:
 - Fix some PUBLISH messages not being counted in $SYS stats. Closes #2448.
 - Fix incorrect return code being sent in DISCONNECT when a client session is
   taken over. Closes #2607.
+- Fix confusing "out of memory" error when a client is kicked in the dynamic
+  security plugin. Closes #2525.
 
 Client library:
 - Fix threads library detection on Windows under cmake. Bumps the minimum
diff --git a/src/control.c b/src/control.c
index 88c4e9da..8a70a967 100644
--- a/src/control.c
+++ b/src/control.c
@@ -65,9 +65,9 @@ int control__process(struct mosquitto *context, struct mosquitto_msg_store *stor
 	}
 
 	if(stored->qos == 1){
-		if(send__puback(context, stored->source_mid, MQTT_RC_SUCCESS, properties)) rc = 1;
+		rc = send__puback(context, stored->source_mid, MQTT_RC_SUCCESS, properties);
 	}else if(stored->qos == 2){
-		if(send__pubrec(context, stored->source_mid, MQTT_RC_SUCCESS, properties)) rc = 1;
+		rc = send__pubrec(context, stored->source_mid, MQTT_RC_SUCCESS, properties);
 	}
 	mosquitto_property_free_all(&properties);