diff --git a/Ryujinx.HLE/HOS/Process.cs b/Ryujinx.HLE/HOS/Process.cs
index fe5cca4d31..e11c265c39 100644
--- a/Ryujinx.HLE/HOS/Process.cs
+++ b/Ryujinx.HLE/HOS/Process.cs
@@ -370,8 +370,6 @@ namespace Ryujinx.HLE.HOS
             if (Threads.Count == 0)
             {
                 Device.System.ExitProcess(ProcessId);
-
-                Unload();
             }
         }
 
diff --git a/Ryujinx.HLE/Switch.cs b/Ryujinx.HLE/Switch.cs
index 272f1de3ae..3154080cda 100644
--- a/Ryujinx.HLE/Switch.cs
+++ b/Ryujinx.HLE/Switch.cs
@@ -79,6 +79,8 @@ namespace Ryujinx.HLE
         internal void Unload()
         {
             VFs.Dispose();
+
+            Memory.Dispose();
         }
 
         public void Dispose()