diff --git a/Utilities/Thread.h b/Utilities/Thread.h
index 5da3699f41..df45fda70d 100644
--- a/Utilities/Thread.h
+++ b/Utilities/Thread.h
@@ -21,10 +21,10 @@ enum class native_core_arrangement : u32
 
 enum class thread_class : u32
 {
-	general,
-	rsx,
-	spu,
-	ppu
+	general = 0,
+	ppu = 1,
+	spu = 2,
+	rsx = 0x55,
 };
 
 enum class thread_state : u32
@@ -36,17 +36,6 @@ enum class thread_state : u32
 	mask = 3
 };
 
-static inline thread_class get_thread_class(u32 thread_id_type)
-{
-	switch (thread_id_type)
-	{
-	case 1: return thread_class::ppu;
-	case 2: return thread_class::spu;
-	case 0x55: return thread_class::rsx;
-	default: return thread_class::general;
-	}
-}
-
 template <class Context>
 class named_thread;
 
diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h
index 89c6f21c30..5e3484f7f5 100644
--- a/rpcs3/Emu/CPU/CPUThread.h
+++ b/rpcs3/Emu/CPU/CPUThread.h
@@ -120,7 +120,7 @@ public:
 
 	thread_class get_class() const
 	{
-		return get_thread_class(id_type());
+		return static_cast<thread_class>(id_type()); // Static cast for performance reasons
 	}
 
 	template <DerivedFrom<cpu_thread> T>