diff --git a/src/main/java/org/swisspush/reststorage/RestStorageHandler.java b/src/main/java/org/swisspush/reststorage/RestStorageHandler.java
index 5180a5c..95e1882 100644
--- a/src/main/java/org/swisspush/reststorage/RestStorageHandler.java
+++ b/src/main/java/org/swisspush/reststorage/RestStorageHandler.java
@@ -46,7 +46,7 @@ public class RestStorageHandler implements Handler<HttpServerRequest> {
     private final boolean return200onDeleteNonExisting;
     private final DecimalFormat decimalFormat;
     private final Integer maxStorageExpandSubresources;
-    private final long resourceCleanupAmount;
+    private final long configuredCleanupAmount;
 
     public RestStorageHandler(
         Vertx vertx,
@@ -64,7 +64,7 @@ public RestStorageHandler(
         this.rejectStorageWriteOnLowMemory = config.isRejectStorageWriteOnLowMemory();
         this.return200onDeleteNonExisting = config.isReturn200onDeleteNonExisting();
         this.maxStorageExpandSubresources = config.getMaxStorageExpandSubresources();
-        this.resourceCleanupAmount = config.getResourceCleanupAmount();
+        this.configuredCleanupAmount = config.getResourceCleanupAmount();
 
         this.decimalFormat = new DecimalFormat();
         this.decimalFormat.setMaximumFractionDigits(1);
@@ -134,11 +134,11 @@ private void cleanup(RoutingContext ctx) {
     }
 
     private String getCleanupResourcesAmountContextOrConfig(RoutingContext ctx) {
-        String cleanupResourcesAmount = ctx.request().getParam("cleanupResourcesAmount");
-        if (StringUtils.isEmpty(cleanupResourcesAmount)) {
-            cleanupResourcesAmount = String.valueOf(this.resourceCleanupAmount);
+        String routingContextCleanupAmount = ctx.request().getParam("cleanupResourcesAmount");
+        if (StringUtils.isNotEmpty(routingContextCleanupAmount)) {
+            return routingContextCleanupAmount;
         }
-        return cleanupResourcesAmount;
+        return String.valueOf(this.configuredCleanupAmount);
     }
 
     private void getResourceNotFound(RoutingContext ctx) {