diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/ArmorImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/ArmorImpl.java
index 5c92f9b9..71bc3e6b 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/ArmorImpl.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/ArmorImpl.java
@@ -4,6 +4,7 @@
 
 package org.pgpainless.sop;
 
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -28,8 +29,11 @@ public class ArmorImpl implements Armor {
         return new Ready() {
             @Override
             public void writeTo(OutputStream outputStream) throws IOException {
-                ArmoredOutputStream armor = ArmoredOutputStreamFactory.get(outputStream);
+                // By buffering the output stream, we can improve performance drastically
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream);
+                ArmoredOutputStream armor = ArmoredOutputStreamFactory.get(bufferedOutputStream);
                 Streams.pipeAll(data, armor);
+                bufferedOutputStream.flush();
                 armor.close();
             }
         };
diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/DearmorImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/DearmorImpl.java
index 73bd65d5..1cebec6e 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/DearmorImpl.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/DearmorImpl.java
@@ -4,6 +4,7 @@
 
 package org.pgpainless.sop;
 
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -22,7 +23,9 @@ public class DearmorImpl implements Dearmor {
 
             @Override
             public void writeTo(OutputStream outputStream) throws IOException {
-                Streams.pipeAll(decoder, outputStream);
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream);
+                Streams.pipeAll(decoder, bufferedOutputStream);
+                bufferedOutputStream.flush();
                 decoder.close();
             }
         };