diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
index 0bbed9dddc..28cd4d87c8 100644
--- a/Utilities/Thread.cpp
+++ b/Utilities/Thread.cpp
@@ -1287,7 +1287,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 	{
 		u32 pf_port_id = 0;
 
-		if (auto pf_entries = fxm::get<page_fault_notification_entries>())
+		if (auto pf_entries = g_fxo->get<page_fault_notification_entries>(); true)
 		{
 			if (auto mem = vm::get(vm::any, addr))
 			{
diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
index 73c2451f98..6e4fb154d4 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
@@ -236,7 +236,7 @@ error_code sys_mmapper_free_address(ppu_thread& ppu, u32 addr)
 	}
 
 	// If a memory block is freed, remove it from page notification table.
-	auto pf_entries = fxm::get_always<page_fault_notification_entries>();
+	auto pf_entries = g_fxo->get<page_fault_notification_entries>();
 	std::lock_guard lock(pf_entries->mutex);
 
 	auto ind_to_remove = pf_entries->entries.begin();
@@ -465,7 +465,7 @@ error_code sys_mmapper_enable_page_fault_notification(ppu_thread& ppu, u32 start
 		return CELL_EAGAIN;
 	}
 
-	auto pf_entries = fxm::get_always<page_fault_notification_entries>();
+	auto pf_entries = g_fxo->get<page_fault_notification_entries>();
 	std::unique_lock lock(pf_entries->mutex);
 
 	// Return error code if page fault notifications are already enabled