diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
index 653994a17..9eb88c3f4 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
@@ -70,10 +70,10 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
     protected void populateDetailsWidget() {
         String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY;
         if (getSelectedBaseEntity() != null) {
-            if (getSelectedBaseEntity().getType().getMaxAssignments() == Integer.MAX_VALUE) {
-                maxAssign = getI18n().get("label.multiAssign.type");
-            } else {
+            if (getSelectedBaseEntity().getType().getMaxAssignments() == 1) {
                 maxAssign = getI18n().get("label.singleAssign.type");
+            } else {
+                maxAssign = getI18n().get("label.multiAssign.type");
             }
             updateSoftwareModuleDetailsLayout(getSelectedBaseEntity().getType().getName(),
                     getSelectedBaseEntity().getVendor(), maxAssign);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
index 9824f14c4..c18f4ac80 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
@@ -181,7 +181,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
              * type is drroped, then add to the list.
              */
 
-            if (module.getType().getMaxAssignments() == Integer.MAX_VALUE) {
+            if (module.getType().getMaxAssignments() > 1) {
                 assignedSWModule.get(module.getType().getName()).append("</br>").append("<I>")
                         .append(getUnsavedAssigedSwModule(module.getName(), module.getVersion())).append("</I>");
             }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index a52c0b683..a22409244 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -295,7 +295,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
 
     private void handleSoftwareCase(final Map<Long, HashSet<SoftwareModuleIdName>> map,
             final SoftwareModule softwareModule, final SoftwareModuleIdName softwareModuleIdName) {
-        if (softwareModule.getType().getMaxAssignments() == Integer.MAX_VALUE) {
+        if (softwareModule.getType().getMaxAssignments() > 1) {
             if (!map.containsKey(softwareModule.getType().getId())) {
                 map.put(softwareModule.getType().getId(), new HashSet<SoftwareModuleIdName>());
             }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
index 472ce8ce1..80dac8a3d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
@@ -99,10 +99,10 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
     private void populateDetails() {
         String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY;
         if (getSelectedBaseEntity() != null) {
-            if (getSelectedBaseEntity().getType().getMaxAssignments() == Integer.MAX_VALUE) {
-                maxAssign = getI18n().get("label.multiAssign.type");
-            } else {
+            if (getSelectedBaseEntity().getType().getMaxAssignments() == 1) {
                 maxAssign = getI18n().get("label.singleAssign.type");
+            } else {
+                maxAssign = getI18n().get("label.multiAssign.type"); 
             }
             updateSwModuleDetailsLayout(getSelectedBaseEntity().getType().getName(),
                     getSelectedBaseEntity().getVendor(), maxAssign);