diff --git a/pcsx2/VUflags.cpp b/pcsx2/VUflags.cpp
index aa3a9fff76..245e452fd8 100644
--- a/pcsx2/VUflags.cpp
+++ b/pcsx2/VUflags.cpp
@@ -49,7 +49,10 @@ static __ri u32 VU_MAC_UPDATE( int shift, VURegs * VU, float f )
 			return s;
 		case 255:
 			VU->macflag = (VU->macflag&~(0x0101<<shift)) | (0x1000<<shift);
-			return s|0x7f7fffff; /* max allowed */
+			if (CHECK_VU_OVERFLOW)
+				return s | 0x7f7fffff; /* max allowed */
+			else
+				return v;
 		default:
 			VU->macflag = (VU->macflag & ~(0x1101<<shift));
 			return v;
diff --git a/pcsx2/VUops.cpp b/pcsx2/VUops.cpp
index 2e7ba72b20..744549c501 100644
--- a/pcsx2/VUops.cpp
+++ b/pcsx2/VUops.cpp
@@ -449,18 +449,19 @@ __fi void _vuBackupVI(VURegs* VU, int reg)
 #ifndef INT_VUDOUBLEHACK
 static float __fastcall vuDouble(u32 f)
 {
-	switch(f & 0x7f800000)
+	switch (f & 0x7f800000)
 	{
 		case 0x0:
 			f &= 0x80000000;
 			return *(float*)&f;
 			break;
 		case 0x7f800000:
-		{
-			u32 d = (f & 0x80000000)|0x7f7fffff;
-			return *(float*)&d;
+			if (CHECK_VU_OVERFLOW)
+			{
+				u32 d = (f & 0x80000000) | 0x7f7fffff;
+				return *(float*)&d;
+			}
 			break;
-		}
 	}
 	return *(float*)&f;
 }