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 899569cb..3dc75c6f 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
@@ -660,12 +660,16 @@ public class KeyRingInfo {
         }
 
         if (nonExpiringSubkeys.isEmpty()) {
-            if (latestSubkeyExpirationDate.before(primaryExpiration)) {
-                return latestSubkeyExpirationDate;
+            if (latestSubkeyExpirationDate != null) {
+                if (primaryExpiration == null) {
+                    return latestSubkeyExpirationDate;
+                }
+                if (latestSubkeyExpirationDate.before(primaryExpiration)) {
+                    return latestSubkeyExpirationDate;
+                }
             }
-            return primaryExpiration;
         }
-        return null;
+        return primaryExpiration;
     }
 
     /**