diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 13161059249e14a062a189000bf5e76b62a7dcc4..a3f5b23727607d44c735d375adc23dcdc9186701 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -222,12 +222,9 @@ class Crypto
 
         $ret = [
             'PEM' => $data,
+            'password' => $metadata->getString($prefix . 'privatekey_pass', null),
         ];
 
-        if ($metadata->hasValue($prefix . 'privatekey_pass')) {
-            $ret['password'] = $metadata->getString($prefix . 'privatekey_pass');
-        }
-
         return $ret;
     }