diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h
index b491dac2..4b649610 100644
--- a/lib/luks2/luks2.h
+++ b/lib/luks2/luks2.h
@@ -379,7 +379,7 @@ json_object *json_segment_get_flags(json_object *jobj_segment);
 bool json_segment_is_backup(json_object *jobj_segment);
 bool json_segment_is_reencrypt(json_object *jobj_segment);
 json_object *json_segments_get_segment(json_object *jobj_segments, int segment);
-int json_segments_count(json_object *jobj_segments);
+unsigned json_segments_count(json_object *jobj_segments);
 json_object *json_segments_get_segment_by_flag(json_object *jobj_segments, const char *flag);
 void json_segment_remove_flag(json_object *jobj_segment, const char *flag);
 uint64_t json_segments_get_minimal_offset(json_object *jobj_segments, unsigned blockwise);
diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
index 1b93438d..ccc34a83 100644
--- a/lib/luks2/luks2_json_metadata.c
+++ b/lib/luks2/luks2_json_metadata.c
@@ -187,12 +187,10 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr)
 
 int LUKS2_segments_count(struct luks2_hdr *hdr)
 {
-	json_object *jobj_segments;
-
-	if (!hdr || !(jobj_segments = LUKS2_get_segments_jobj(hdr)))
+	if (!hdr)
 		return -EINVAL;
 
-	return json_segments_count(jobj_segments);
+	return json_segments_count(LUKS2_get_segments_jobj(hdr));
 }
 
 int LUKS2_get_default_segment(struct luks2_hdr *hdr)
@@ -2040,9 +2038,6 @@ static int _reload_custom_multi(struct crypt_device *cd,
 		.size = device_size >> SECTOR_SHIFT
 	};
 
-	if (count < 0)
-		return -EINVAL;
-
 	/* do not allow activation when particular requirements detected */
 	if ((r = LUKS2_unmet_requirements(cd, hdr, CRYPT_REQUIREMENT_ONLINE_REENCRYPT, 0)))
 		return r;
@@ -2094,9 +2089,6 @@ int LUKS2_activate_multi(struct crypt_device *cd,
 		.uuid   = crypt_get_uuid(cd)
 	};
 
-	if (count < 0)
-		return -EINVAL;
-
 	/* do not allow activation when particular requirements detected */
 	if ((r = LUKS2_unmet_requirements(cd, hdr, CRYPT_REQUIREMENT_ONLINE_REENCRYPT, 0)))
 		return r;
diff --git a/lib/luks2/luks2_segment.c b/lib/luks2/luks2_segment.c
index 6fce8a50..4779d95c 100644
--- a/lib/luks2/luks2_segment.c
+++ b/lib/luks2/luks2_segment.c
@@ -178,12 +178,12 @@ json_object *json_segments_get_segment(json_object *jobj_segments, int segment)
 	return jobj;
 }
 
-int json_segments_count(json_object *jobj_segments)
+unsigned json_segments_count(json_object *jobj_segments)
 {
-	int count = 0;
+	unsigned count = 0;
 
 	if (!jobj_segments)
-		return -EINVAL;
+		return 0;
 
 	json_object_object_foreach(jobj_segments, slot, val) {
 		UNUSED(slot);