diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
index e95c9ff7..d95e3e3c 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
@@ -348,17 +348,11 @@ public class OpenPgpMessageInputStream extends InputStream {
 
         if (in != null) {
             in.close();
-            in = null; // TODO: Collect result of in before nulling
-            if (automaton.getState() != PDA.State.LiteralMessage) {
-                automaton.next(InputAlphabet.EndOfSequence);
-                automaton.assertValid();
-            }
-        } else {
-            automaton.next(InputAlphabet.EndOfSequence);
-            automaton.assertValid();
+            in = null;
         }
 
-        super.close();
+        automaton.next(InputAlphabet.EndOfSequence);
+        automaton.assertValid();
         closed = true;
     }