diff --git a/src/internal.c b/src/internal.c
index 45259945a..9d9fffca1 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -6384,6 +6384,12 @@ int ProcessReply(CYASSL* ssl)
                     }
                 #endif
                 ssl->options.processReply = runProcessingOneMessage;
+
+                if (ssl->keys.encryptionOn) {
+                    CYASSL_MSG("Bundled encrypted messages, remove middle pad");
+                    ssl->buffers.inputBuffer.idx -= ssl->keys.padSz;
+                }
+
                 continue;
             }
             /* more records */
@@ -9161,6 +9167,9 @@ static void PickHashSigAlgo(CYASSL* ssl,
         else if (IsTLS(ssl))
             ssl->options.sendVerify = SEND_BLANK_CERT;
 
+        if (ssl->keys.encryptionOn)
+            *inOutIdx += ssl->keys.padSz;
+
         return 0;
     }
 #endif /* !NO_CERTS */