diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
index d2cc8ecd..e7caa43b 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
@@ -52,12 +52,8 @@ class KeyRingBuilder : KeyRingBuilderInterface<KeyRingBuilder> {
         addUserId(Strings.fromUTF8ByteArray(userId))
 
     override fun setExpirationDate(expirationDate: Date?): KeyRingBuilder = apply {
-        if (expirationDate == null) {
-            this.expirationDate = null
-            return@apply
-        }
         this.expirationDate =
-            expirationDate.let {
+            expirationDate?.let {
                 require(Date() < expirationDate) { "Expiration date must be in the future." }
                 expirationDate
             }