diff --git a/action/ActionMessage.cpp b/action/ActionMessage.cpp
index b0bcabaa..4e56feea 100644
--- a/action/ActionMessage.cpp
+++ b/action/ActionMessage.cpp
@@ -1,3 +1,4 @@
+#include <fsfw/action/HasActionsIF.h>
 #include "ActionMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../storagemanager/StorageManagerIF.h"
@@ -53,7 +54,7 @@ void ActionMessage::setDataReply(CommandMessage* message, ActionId_t actionId,
 
 void ActionMessage::setCompletionReply(CommandMessage* message,
 		ActionId_t fid, ReturnValue_t result) {
-	if (result == HasReturnvaluesIF::RETURN_OK) {
+	if (result == HasReturnvaluesIF::RETURN_OK or result == HasActionsIF::EXECUTION_FINISHED) {
 		message->setCommand(COMPLETION_SUCCESS);
 	} else {
 		message->setCommand(COMPLETION_FAILED);