diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 660db8fd..1a50d9f5 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1925,7 +1925,7 @@ func cleanupExecutions(resp http.ResponseWriter, request *http.Request) {
 	var workflowExecutions []WorkflowExecution
 	_, err = dbclient.GetAll(ctx, q, &workflowExecutions)
 	if err != nil {
-		log.Printf("Error getting workflowexec: %s", err)
+		log.Printf("Error getting workflowexec (cleanup): %s", err)
 		resp.WriteHeader(401)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting all workflowexecutions"}`)))
 		return
@@ -4404,7 +4404,7 @@ func getWorkflowExecutions(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	// Query for the specifci workflowId
-	q := datastore.NewQuery("workflowexecution").Filter("workflow_id =", fileId).Order("-started_at").Limit(50)
+	q := datastore.NewQuery("workflowexecution").Filter("workflow_id =", fileId).Order("-started_at").Limit(20)
 	var workflowExecutions []WorkflowExecution
 	_, err = dbclient.GetAll(ctx, q, &workflowExecutions)
 	if err != nil {
diff --git a/frontend/src/Workflows.js b/frontend/src/Workflows.js
index d0c4e226..e3dccbec 100644
--- a/frontend/src/Workflows.js
+++ b/frontend/src/Workflows.js
@@ -180,15 +180,20 @@ const Workflows = (props) => {
 		.then((response) => {
 			if (response.status !== 200) {
 				console.log("Status not 200 for WORKFLOW EXECUTION :O!")
-				alert.error("Failed loading executions for current workflow")
 			}
 
 			return response.json()
 		})
 		.then((responseJson) => {
-			setWorkflowExecutions(responseJson)
-			if (responseJson.length > 0) {
-				setSelectedExecution(responseJson[0])
+			if (responseJson.success === true) {
+				setWorkflowExecutions(responseJson)
+				if (responseJson.length > 0) {
+					setSelectedExecution(responseJson[0])
+				}
+			} else if (!responseJson.success && responseJson.reason !== undefined) {
+				alert.error("Failed loading executions: "+responseJson.reason)
+			} else {
+				alert.error("Failed loading executions for workflow")
 			}
 		})
 		.catch(error => {