diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp
index ccdb51c01b..450994a0ba 100644
--- a/rpcs3/Emu/NP/np_handler.cpp
+++ b/rpcs3/Emu/NP/np_handler.cpp
@@ -381,6 +381,11 @@ void np_handler::init_NP(u32 poolsize, vm::ptr<void> poolptr)
 
 void np_handler::terminate_NP()
 {
+	// TODO: proper cleanup of everything here
+
+	// Unregister basic handler
+	basic_handler.registered = false;
+
 	// Reset memory pool
 	mpool.set(0);
 	mpool_size  = 0;