diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 8140de6dd..8b48d18bf 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -484,6 +484,8 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
           iobuf_t output = iobuf_esopen (fp, "w", 0, 0);
           armor_filter_context_t *afx = NULL;
 
+	  es_setbuf (fp, NULL);
+
           if (opt.armor)
             {
               afx = new_armor_context ();