diff --git a/source/ControllerSwitch/SwitchControllerHandler.cpp b/source/ControllerSwitch/SwitchControllerHandler.cpp
index 7f7958f..79b7293 100644
--- a/source/ControllerSwitch/SwitchControllerHandler.cpp
+++ b/source/ControllerSwitch/SwitchControllerHandler.cpp
@@ -13,7 +13,6 @@ SwitchControllerHandler::SwitchControllerHandler(std::unique_ptr<IController> &&
 
 SwitchControllerHandler::~SwitchControllerHandler()
 {
-    Exit();
 }
 
 Result SwitchControllerHandler::Initialize()
diff --git a/source/ControllerSwitch/SwitchUSBEndpoint.cpp b/source/ControllerSwitch/SwitchUSBEndpoint.cpp
index e61faeb..4d408c9 100644
--- a/source/ControllerSwitch/SwitchUSBEndpoint.cpp
+++ b/source/ControllerSwitch/SwitchUSBEndpoint.cpp
@@ -11,6 +11,11 @@ SwitchUSBEndpoint::SwitchUSBEndpoint(UsbHsClientIfSession &if_session, usb_endpo
 SwitchUSBEndpoint::~SwitchUSBEndpoint()
 {
     Close();
+    if (m_buffer != nullptr)
+    {
+        free(m_buffer);
+        m_buffer = nullptr;
+    }
 }
 
 Result SwitchUSBEndpoint::Open(int maxPacketSize)
@@ -21,6 +26,8 @@ Result SwitchUSBEndpoint::Open(int maxPacketSize)
     if (R_FAILED(rc))
         return 73011;
 
+    if (m_buffer != nullptr)
+        free(m_buffer);
     m_buffer = memalign(0x1000, maxPacketSize);
     if (m_buffer == nullptr)
         return -1;
@@ -29,12 +36,6 @@ Result SwitchUSBEndpoint::Open(int maxPacketSize)
 
 void SwitchUSBEndpoint::Close()
 {
-    if (m_buffer != nullptr)
-    {
-        free(m_buffer);
-        m_buffer = nullptr;
-    }
-
     usbHsEpClose(&m_epSession);
 }