diff --git a/pcsx2/Vif.cpp b/pcsx2/Vif.cpp
index 83187ecaaf..a6b4699aaf 100644
--- a/pcsx2/Vif.cpp
+++ b/pcsx2/Vif.cpp
@@ -17,6 +17,7 @@
 #include "Common.h"
 #include "Vif.h"
 #include "Vif_Dma.h"
+#include "newVif.h"
 #include "GS.h"
 #include "Gif.h"
 
@@ -60,29 +61,39 @@ void vif1Reset()
 
 void SaveStateBase::vif0Freeze()
 {
-	static u32 g_vif0Masks[64];   // Dummy Var for saved state compatibility
-	static u32 g_vif0HasMask3[4]; // Dummy Var for saved state compatibility
 	FreezeTag("VIFdma");
-
-	// Dunno if this one is needed, but whatever, it's small. :)
-	Freeze(g_vifCycles);
-
-	// mask settings for VIF0 and VIF1
-	Freeze(g_vifmask);
-
+	Freeze(g_vifCycles); // Dunno if this one is needed, but whatever, it's small. :)
+	Freeze(g_vifmask);	 // mask settings for VIF0 and VIF1
 	Freeze(vif0);
-	Freeze(g_vif0HasMask3);	// Not Used Anymore
-	Freeze(g_vif0Masks);	// Not Used Anymore
+
+	if (GetVersion() <= 3) {
+		static u32 g_vif0Masks[64];   // Dummy Var for saved state compatibility
+		static u32 g_vif0HasMask3[4]; // Dummy Var for saved state compatibility
+		Freeze(g_vif0HasMask3);	// Not Used Anymore
+		Freeze(g_vif0Masks);	// Not Used Anymore
+		nVif[0].bSize = 0;
+	}
+	else {
+		Freeze(nVif[0].bSize);
+		FreezeMem(nVif[0].buffer, nVif[0].bSize);
+	}
 }
 
 void SaveStateBase::vif1Freeze()
 {
-	static u32 g_vif1Masks[64];   // Dummy Var for saved state compatibility
-	static u32 g_vif1HasMask3[4]; // Dummy Var for saved state compatibility
 	Freeze(vif1);
 
-	Freeze(g_vif1HasMask3);	// Not Used Anymore
-	Freeze(g_vif1Masks);	// Not Used Anymore
+	if (GetVersion() <= 3) {
+		static u32 g_vif1Masks[64];   // Dummy Var for saved state compatibility
+		static u32 g_vif1HasMask3[4]; // Dummy Var for saved state compatibility
+		Freeze(g_vif1HasMask3);	// Not Used Anymore
+		Freeze(g_vif1Masks);	// Not Used Anymore
+		nVif[1].bSize = 0;
+	}
+	else {
+		Freeze(nVif[1].bSize);
+		FreezeMem(nVif[1].buffer, nVif[1].bSize);
+	}
 }
 
 //------------------------------------------------------------------
diff --git a/pcsx2/x86/newVif.h b/pcsx2/x86/newVif.h
index d0e23c7ca1..247bb6c50b 100644
--- a/pcsx2/x86/newVif.h
+++ b/pcsx2/x86/newVif.h
@@ -85,6 +85,8 @@ struct nVifStruct {
 	VURegs*					VU;				// VU  Regs   ptr
 	u8*						vuMemEnd;		// End of VU Memory
 	u32						vuMemLimit;		// Use for fast AND
+	u32						bSize;			// Size of 'buffer'
+	u8						buffer[0x4000]; // Buffer for partial transfers
 	u8*						recPtr;			// Cur Pos to recompile to
 	u8*						recEnd;			// End of Rec Cache
 	BlockBuffer*			vifCache;		// Block Buffer
diff --git a/pcsx2/x86/newVif_Dynarec.cpp b/pcsx2/x86/newVif_Dynarec.cpp
index c20d2858c5..51e0105372 100644
--- a/pcsx2/x86/newVif_Dynarec.cpp
+++ b/pcsx2/x86/newVif_Dynarec.cpp
@@ -21,7 +21,6 @@
 #include "newVif_UnpackSSE.h"
 
 static __aligned16 nVifBlock _vBlock = {0};
-//static __pagealigned u8 nVifMemCmp[__pagesize];
 
 void dVifInit(int idx) {
 	nVif[idx].numBlocks =  0;
@@ -124,14 +123,6 @@ static void ShiftDisplacementWindow( xAddressInfo& addr, const xRegister32& modR
 	}
 	if(addImm) xADD(modReg, addImm);
 }
-/*static bool UsesTwoRegs[] = 
-{
-	true,  true,  true,  true,
-	false, false, false, false,
-	false, false, false, false,
-	false, false, false, true,
-
-};*/
 
 void VifUnpackSSE_Dynarec::CompileRoutine() {
 	const int  upkNum	 = v.vif->cmd & 0xf;
@@ -220,7 +211,6 @@ _f void dVifUnpack(int idx, u8 *data, u32 size, bool isFill) {
 	const int	doMask		= v.vif->cmd & 0x10;
 	const int	cycle_cl	= v.vifRegs->cycle.cl;
 	const int	cycle_wl	= v.vifRegs->cycle.wl;
-//	const int	cycleSize	= isFill ? cycle_cl : cycle_wl;
 	const int	blockSize	= isFill ? cycle_wl : cycle_cl;
 
 	if (v.vif->cl >= blockSize) v.vif->cl = 0;
diff --git a/pcsx2/x86/newVif_Unpack.cpp b/pcsx2/x86/newVif_Unpack.cpp
index 4c1fc63281..4d81a77b3e 100644
--- a/pcsx2/x86/newVif_Unpack.cpp
+++ b/pcsx2/x86/newVif_Unpack.cpp
@@ -77,6 +77,8 @@ void initNewVif(int idx) {
 	nVif[idx].vuMemEnd		= idx ? ((u8*)(VU1.Mem + 0x4000)) : ((u8*)(VU0.Mem + 0x1000));
 	nVif[idx].vuMemLimit	= idx ? 0x3ff0 : 0xff0;
 	nVif[idx].vifCache		= NULL;
+	nVif[idx].bSize			= 0;
+	memzero(nVif[idx].buffer);
 
 	VifUnpackSSE_Init();
 	if (newVifDynaRec) dVifInit(idx);
@@ -118,15 +120,12 @@ int nVifUnpack(int idx, u8* data) {
 	const bool isFill = (vifRegs->cycle.cl < vifRegs->cycle.wl);
 	s32		   size   = ret << 2;
 
-	static u8  buffer[2][0x4000] = {0};
-	static int bSize [2]		 = {0};
-
 	if (ret == v.vif->tag.size) { // Full Transfer
-		if (bSize) { // Last transfer was partial
-			memcpy(&buffer[idx][bSize[idx]], data, size);
-			bSize[idx] += size;
-			data = buffer[idx];
-			size = bSize [idx];
+		if (v.bSize) { // Last transfer was partial
+			memcpy(&v.buffer[v.bSize], data, size);
+			v.bSize += size;
+			data = v.buffer;
+			size = v.bSize;
 		}
 		if (size > 0) {
 			if (newVifDynaRec)  dVifUnpack(idx, data, size, isFill);
@@ -134,11 +133,11 @@ int nVifUnpack(int idx, u8* data) {
 		}	else if (isFill)   _nVifUnpack(idx, data, size, isFill);
 		vif->tag.size = 0;
 		vif->cmd = 0;
-		bSize[idx] = 0;
+		v.bSize  = 0;
 	}
 	else { // Partial Transfer
-		memcpy(&buffer[idx][bSize[idx]], data, size);
-		bSize[idx]	  += size;
+		memcpy(&v.buffer[v.bSize], data, size);
+		v.bSize		  += size;
 		vif->tag.size -= ret;
 	}