diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c
index c747e84..fb0cd2b 100644
--- a/src/ctrl/control_cmd.c
+++ b/src/ctrl/control_cmd.c
@@ -566,6 +566,7 @@
 
 	cd = talloc_zero(ctx, struct ctrl_cmd_def);
 
+	cmd->defer = cd;
 	cd->cmd = cmd;
 	cd->data = data;
 
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
index 07de0d4..df8abbc 100644
--- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -401,6 +401,13 @@
 	if (cmd->type != CTRL_TYPE_ERROR) {
 		cmd->ccon = ccon;
 		if (ctrl_cmd_handle(ctrl, cmd, ctrl->data) == CTRL_CMD_HANDLED) {
+
+			if (cmd->defer) {
+				/* The command is still stored as ctrl_cmd_def.cmd, in the def_cmds list.
+				 * Just leave hanging for deferred handling. Reply will happen later. */
+				return 0;
+			}
+
 			/* On CTRL_CMD_HANDLED, no reply needs to be sent back. */
 			talloc_free(cmd);
 			cmd = NULL;