diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ab94ae0e..8ee076cf 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3539,10 +3539,7 @@ my sub print_ovmf_drive_commandlines {
 	my ($path, $format) = $d->@{'file', 'format'};
 	if ($storeid) {
 	    $path = PVE::Storage::path($storecfg, $d->{file});
-	    if (!defined($format)) {
-		my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
-		$format = qemu_img_format($scfg, $volname);
-	    }
+	    $format //= checked_volume_format($storecfg, $d->{file});
 	} elsif (!defined($format)) {
 	    die "efidisk format must be specified\n";
 	}