diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
index c5d62e07..635e5ae4 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
@@ -210,12 +210,15 @@ public class KeyRingInfo {
     }
 
     /**
-     * Return the date of expiration of the primary key.
+     * Return the date of expiration of the primary key or null if the key has no expiration date.
      *
      * @return expiration date
      */
     public Date getExpirationDate() {
         long validSeconds = getPublicKey().getValidSeconds();
+        if (validSeconds == 0) {
+            return null;
+        }
         return new Date(getCreationDate().getTime() + (1000 * validSeconds));
     }