diff --git a/state.c b/state.c
index 77ac3010..8fb07828 100644
--- a/state.c
+++ b/state.c
@@ -801,6 +801,10 @@ static void state_map(struct snapraid_state* state)
 		tommy_list_insert_tail(&state->maplist, &map->node, map);
 	}
 
+	/* without configuration don't check for number of data disks */
+	if (state->no_conf)
+		return;
+
 	/* checks if mapping match the disk uuid */
 	uuid_mismatch = 0;
 	for(i=state->maplist;i!=0;i=i->next) {
@@ -855,10 +859,6 @@ static void state_map(struct snapraid_state* state)
 		exit(EXIT_FAILURE);
 	}
 
-	/* without configuration don't check for number of data disks */
-	if (state->no_conf)
-		return;
-
 	/* count the number of data disks, including holes left after removing some */
 	diskcount = 0;
 	for(i=state->maplist;i!=0;i=i->next) {