diff --git a/src/internal.c b/src/internal.c
index b2be0cd9..1927cd1a 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1133,41 +1133,41 @@ void SshResourceFree(WOLFSSH* ssh, void* heap)
 
 #ifdef WOLFSSH_SCP
     if (ssh->scpConfirmMsg) {
-        WFREE(ssh->scpConfirmMsg, ssh->ctx->heap, DYNTYPE_STRING);
+        WFREE(ssh->scpConfirmMsg, heap, DYNTYPE_STRING);
         ssh->scpConfirmMsg = NULL;
         ssh->scpConfirmMsgSz = 0;
     }
     if (ssh->scpFileBuffer) {
         ForceZero(ssh->scpFileBuffer, ssh->scpFileBufferSz);
-        WFREE(ssh->scpFileBuffer, ssh->ctx->heap, DYNTYPE_BUFFER);
+        WFREE(ssh->scpFileBuffer, heap, DYNTYPE_BUFFER);
         ssh->scpFileBuffer = NULL;
         ssh->scpFileBufferSz = 0;
     }
     if (ssh->scpFileName) {
-        WFREE(ssh->scpFileName, ssh->ctx->heap, DYNTYPE_STRING);
+        WFREE(ssh->scpFileName, heap, DYNTYPE_STRING);
         ssh->scpFileName = NULL;
         ssh->scpFileNameSz = 0;
     }
     if (ssh->scpRecvMsg) {
-        WFREE(ssh->scpRecvMsg, ssh->ctx->heap, DYNTYPE_STRING);
+        WFREE(ssh->scpRecvMsg, heap, DYNTYPE_STRING);
         ssh->scpRecvMsg = NULL;
         ssh->scpRecvMsgSz = 0;
     }
 #ifdef WOLFSSL_NUCLEUS
-    WFREE(ssh->scpBasePathDynamic, ssh->ctx->heap, DYNTYPE_BUFFER);
+    WFREE(ssh->scpBasePathDynamic, heap, DYNTYPE_BUFFER);
     ssh->scpBasePathDynamic = NULL;
     ssh->scpBasePathSz = 0;
 #endif
 #endif
 #ifdef WOLFSSH_SFTP
     if (ssh->sftpDefaultPath) {
-        WFREE(ssh->sftpDefaultPath, ssh->ctx->heap, DYNTYPE_STRING);
+        WFREE(ssh->sftpDefaultPath, heap, DYNTYPE_STRING);
         ssh->sftpDefaultPath = NULL;
     }
 #endif
 #ifdef WOLFSSH_TERM
     if (ssh->modes) {
-        WFREE(ssh->modes, ssh->ctx->heap, DYNTYPE_STRING);
+        WFREE(ssh->modes, heap, DYNTYPE_STRING);
         ssh->modesSz = 0;
     }
 #endif