--- 9191b2f6e1f55b0e09f96f710e70be01febb4e50
+++ cef74ba0666c2c7cab9a755a29c8ce5985a5dde7
@@ -627,12 +627,14 @@ static void __rpc_execute(struct rpc_tas
 			save_callback = task->tk_callback;
 			task->tk_callback = NULL;
 			save_callback(task);
-		} else {
-			/*
-			 * Perform the next FSM step.
-			 * tk_action may be NULL when the task has been killed
-			 * by someone else.
-			 */
+		}
+
+		/*
+		 * Perform the next FSM step.
+		 * tk_action may be NULL when the task has been killed
+		 * by someone else.
+		 */
+		if (!RPC_IS_QUEUED(task)) {
 			if (task->tk_action == NULL)
 				break;
 			task->tk_action(task);