diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 247237898..891db9663 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -294,22 +294,13 @@ LuksBootKeyFileJob::exec()
         return Calamares::JobResult::ok();
     }
 
-    if ( hasUnencryptedSeparateBoot() && !hasEncryptedRoot() )
+    if ( hasUnencryptedSeparateBoot() )
     {
-        // /boot partition is not encrypted, keyfile must not be used
-        // But only if root partition is not encrypted
+        // /boot partition is not encrypted, keyfile must not be used.
         cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
         return Calamares::JobResult::ok();
     }
-
-        if ( hasUnencryptedSeparateBoot() && hasEncryptedRoot() )
-    {
-        // /boot partition is not encrypted, keyfile must not be used
-        // But only if root partition is encrypted
-        cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
-        return Calamares::JobResult::ok();
-    }
-
+    
     if ( s.devices.first().passphrase.isEmpty() )
     {
         cDebug() << Logger::SubEntry << "No root passphrase.";