diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
index b96f1fb37..76fdedc78 100644
--- a/package/yast2-bootloader.changes
+++ b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
+
+- Do not try finding undefined bootloader name to avoid error
+  in logs (bsc#1218700)
+- 4.6.5
+
 -------------------------------------------------------------------
 Thu Sep  7 13:44:17 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
 
diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
index 7a5fe7978..5dff1bb2b 100644
--- a/package/yast2-bootloader.spec
+++ b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.6.4
+Version:        4.6.5
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later
diff --git a/src/lib/bootloader/bootloader_factory.rb b/src/lib/bootloader/bootloader_factory.rb
index c49431b51..15389712f 100644
--- a/src/lib/bootloader/bootloader_factory.rb
+++ b/src/lib/bootloader/bootloader_factory.rb
@@ -32,7 +32,10 @@ def proposed
       end
 
       def system
-        bootloader_by_name(Sysconfig.from_system.bootloader)
+        sysconfig_name = Sysconfig.from_system.bootloader
+        return nil unless sysconfig_name
+
+        bootloader_by_name(sysconfig_name)
       end
 
       def current