diff --git a/common/emitter/x86types.h b/common/emitter/x86types.h
index 43e15fc3f1..1da6014725 100644
--- a/common/emitter/x86types.h
+++ b/common/emitter/x86types.h
@@ -75,7 +75,7 @@ namespace x86Emitter
 	template <typename T>
 	static __fi bool is_s8(T imm)
 	{
-		return (s8)imm == (s32)imm;
+		return (s8)imm == (typename std::make_signed<T>::type)imm;
 	}
 
 	template <typename T>