diff --git a/docs/changes.txt b/docs/changes.txt
index 3f9ec9f40..1b72b39e4 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -68,6 +68,7 @@
 - OpenCL Device Management: Fixed several memory leaks when initialization of a device/platform failed
 - Outfile Check: Fixed a memory leak for failed outfile reads
 - Rule Engine: Fixed several memory leaks when loading of rules failed
+- Session Management: Fixed several memory leaks when profile/install folder setup failed
 - OpenCL Header: Updated CL_* errorcode to OpenCL 1.2 standard
 - OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.60 is detected which is known to be broken
 - OpenCL Kernel: Renumbered hash-mode 7600 to 4521
diff --git a/src/folder.c b/src/folder.c
index acc5cf259..85ddb1b0c 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -412,6 +412,11 @@ int folder_config_init (hashcat_ctx_t *hashcat_ctx, MAYBE_UNUSED const char *ins
   {
     event_log_error (hashcat_ctx, "%s: %s", cpath, strerror (errno));
 
+    hcfree (shared_dir);
+    hcfree (profile_dir);
+    hcfree (cpath_real);
+    hcfree (session_dir);
+
     return -1;
   }