diff --git a/src/fundamental/bootspec-fundamental.c b/src/fundamental/bootspec-fundamental.c
index 89e29f5982..c0138926a5 100644
--- a/src/fundamental/bootspec-fundamental.c
+++ b/src/fundamental/bootspec-fundamental.c
@@ -46,7 +46,7 @@ sd_bool bootspec_pick_name_version_sort_key(
         good_version = os_image_version ?: (os_version ?: (os_version_id ? : os_build_id));
         good_sort_key = os_image_id ?: os_id;
 
-        if (!good_name || !good_version)
+        if (!good_name)
                 return sd_false;
 
         if (ret_name)
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 09eb36eb56..123db59575 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -530,9 +530,11 @@ static int boot_entry_load_unified(
         if (!tmp.sort_key)
                 return log_oom();
 
-        tmp.version = strdup(good_version);
-        if (!tmp.version)
-                return log_oom();
+        if (good_version) {
+                tmp.version = strdup(good_version);
+                if (!tmp.version)
+                        return log_oom();
+        }
 
         *ret = tmp;
         tmp = (BootEntry) {};