diff --git a/src/boot/bootctl-util.c b/src/boot/bootctl-util.c
index f89721244a..62c0b64406 100644
--- a/src/boot/bootctl-util.c
+++ b/src/boot/bootctl-util.c
@@ -41,7 +41,9 @@ const char *get_efi_arch(void) {
         if (r == -ENOENT)
                 return EFI_MACHINE_TYPE_NAME;
         if (r < 0) {
-                log_warning_errno(r, "Error reading EFI firmware word size, assuming '%i': %m", __WORDSIZE);
+                log_warning_errno(r,
+                        "Error reading EFI firmware word size, assuming machine type '%s': %m",
+                        EFI_MACHINE_TYPE_NAME);
                 return EFI_MACHINE_TYPE_NAME;
         }
 
@@ -51,9 +53,9 @@ const char *get_efi_arch(void) {
                 return "ia32";
 
         log_warning(
-                "Unknown EFI firmware word size '%s', using default word size '%i' instead.",
+                "Unknown EFI firmware word size '%s', using machine type '%s'.",
                 platform_size,
-                __WORDSIZE);
+                EFI_MACHINE_TYPE_NAME);
 #endif
 
         return EFI_MACHINE_TYPE_NAME;