diff --git a/nflow-rest-api-spring-web/src/main/java/io/nflow/rest/v1/springweb/MaintenanceResource.java b/nflow-rest-api-spring-web/src/main/java/io/nflow/rest/v1/springweb/MaintenanceResource.java
index c857046e5..d374ec72a 100644
--- a/nflow-rest-api-spring-web/src/main/java/io/nflow/rest/v1/springweb/MaintenanceResource.java
+++ b/nflow-rest-api-spring-web/src/main/java/io/nflow/rest/v1/springweb/MaintenanceResource.java
@@ -46,11 +46,11 @@ public MaintenanceResource(SchedulerService scheduler, MaintenanceService mainte
   @ApiOperation(value = "Do maintenance on old workflow instances synchronously", response = MaintenanceResponse.class)
   public Mono<ResponseEntity<?>> cleanupWorkflows(
       @RequestBody @ApiParam(value = "Parameters for the maintenance process", required = true) MaintenanceRequest request) {
-    return handleExceptions(() -> {
+    return handleExceptions(() -> wrapBlocking(() -> {
       MaintenanceConfiguration configuration = converter.convert(request);
       MaintenanceResults results = maintenanceService.cleanupWorkflows(configuration);
-      return wrapBlocking(() -> ok(converter.convert(results)));
-    });
+      return ok(converter.convert(results));
+    }));
   }
 
 }