diff --git a/src/repart/repart.c b/src/repart/repart.c
index 1cdc0a051f..2af567eb6c 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -2969,7 +2969,7 @@ static int partition_read_definition(
         if (streq_ptr(p->format, "empty")) {
                 p->format = mfree(p->format);
 
-                if (p->no_auto < 0)
+                if (p->no_auto < 0 && gpt_partition_type_knows_no_auto(p->type))
                         p->no_auto = true;
 
                 if (!p->new_label) {