diff --git a/Implementation/API/amc_api_handler_executions.cpp b/Implementation/API/amc_api_handler_executions.cpp
index 6057d5bf..35d4926f 100644
--- a/Implementation/API/amc_api_handler_executions.cpp
+++ b/Implementation/API/amc_api_handler_executions.cpp
@@ -87,7 +87,8 @@ void CAPIHandler_Executions::handleListExecutionsRequest(CJSONWriter& writer, CA
 
 		uint64_t nStartTimeStamp = pExecution->GetStartTimeStampInMicroseconds();
 		uint64_t nEndTimeStamp = 0;
-		if (status == LibMCData::eBuildJobExecutionStatus::Finished) {
+		// Failed (e.g. aborted) executions also have an end time stamp.
+		if ((status == LibMCData::eBuildJobExecutionStatus::Finished) || (status == LibMCData::eBuildJobExecutionStatus::Failed)) {
 			nEndTimeStamp = pExecution->GetEndTimeStampInMicroseconds();
 		}