diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java
index 652761674..fdf40e456 100644
--- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java
+++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java
@@ -76,7 +76,7 @@ public class MgmtDistributionSetStatistics {
       MgmtDistributionSetStatistics statistics = new MgmtDistributionSetStatistics();
       statistics.totalActionsPerStatus = calculateTotalWithStatus(totalActionsPerStatus);
       statistics.totalRolloutsPerStatus = calculateTotalWithStatus(totalRolloutsPerStatus);
-      statistics.totalAutoAssignments = fullRepresentation ? (totalAutoAssignments == null ?  Long.valueOf(0) : totalAutoAssignments) : totalAutoAssignments;
+      statistics.totalAutoAssignments = calculateTotalAutoAssignments();
       return statistics;
     }
 
@@ -89,6 +89,14 @@ public class MgmtDistributionSetStatistics {
       statusMap.put(TOTAL, total);
       return statusMap;
     }
+
+    private Long calculateTotalAutoAssignments() {
+      if (fullRepresentation) {
+        return totalAutoAssignments == null ?  Long.valueOf(0) : totalAutoAssignments;
+      }
+
+      return totalAutoAssignments;
+    }
   }
 }