diff --git a/api/src/main/java/org/openmrs/module/openconceptlab/importer/Saver.java b/api/src/main/java/org/openmrs/module/openconceptlab/importer/Saver.java
index 23a337c..167b71d 100644
--- a/api/src/main/java/org/openmrs/module/openconceptlab/importer/Saver.java
+++ b/api/src/main/java/org/openmrs/module/openconceptlab/importer/Saver.java
@@ -232,9 +232,7 @@ public Concept toConcept(CacheService cacheService, OclConcept oclConcept) throw
 			setAllowDecimal(numeric, extras);
 		}
 
-		if (extras.getIsSet() != null) {
-			concept.setSet(extras.getIsSet() == 1);
-		}
+		concept.setSet(extras.getIsSet() != null && extras.getIsSet() == 1);
 
 		concept.setRetired(oclConcept.isRetired());
 		if (oclConcept.isRetired()) {
@@ -403,9 +401,6 @@ public Item saveMapping(final CacheService cacheService, final Import update, fi
 					if (oclMapping.getMapType().equals(MapType.Q_AND_A)) {
 						item = updateOrAddAnswersFromOcl(update, oclMapping, fromConcept, toConcept);
 					} else {
-						if (!fromConcept.getSet()) {
-						    fromConcept.setSet(true);
-						}
 						item = updateOrAddSetMembersFromOcl(update, oclMapping, fromConcept, toConcept);
 					}
 
@@ -586,6 +581,8 @@ Item updateOrAddSetMembersFromOcl(Import update, OclMapping oclMapping, Concept
 			}
 		}
 
+		set.setSet(!set.getSetMembers().isEmpty());
+
 		return item;
 	}