diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c
index b38eda0..33f369a 100644
--- a/kernel/mem_domain.c
+++ b/kernel/mem_domain.c
@@ -81,7 +81,7 @@
 
 	key = irq_lock();
 
-	domain->num_partitions = num_parts;
+	domain->num_partitions = 0;
 	(void)memset(domain->partitions, 0, sizeof(domain->partitions));
 
 	if (num_parts) {
@@ -92,16 +92,14 @@
 			__ASSERT((parts[i]->start + parts[i]->size) >
 				 parts[i]->start, "");
 
-			domain->partitions[i] = *parts[i];
-		}
-
 #if defined(CONFIG_EXECUTE_XOR_WRITE)
-		for (i = 0; i < num_parts; i++) {
 			__ASSERT(sane_partition_domain(domain,
-						       &domain->partitions[i]),
+						       parts[i]),
 				 "");
-		}
 #endif
+			domain->partitions[i] = *parts[i];
+			domain->num_partitions++;
+		}
 	}
 
 	sys_dlist_init(&domain->mem_domain_q);