diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h
index 798750ca73..3e9c71bfb9 100644
--- a/Source/Core/Common/Src/VideoBackendBase.h
+++ b/Source/Core/Common/Src/VideoBackendBase.h
@@ -49,7 +49,7 @@ struct SCPFifoStruct
 	volatile u32 CPWritePointer;
 	volatile u32 CPReadPointer;
 	volatile u32 CPBreakpoint;
-
+	volatile u32 SafeCPReadPointer;
 	// Super Monkey Ball Adventure require this.
 	// Because the read&check-PEToken-loop stays in its JITed block I suppose.
 	// So no possiblity to ack the Token irq by the scheduler until some sort of PPC watchdog do its mess.
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index a8ee3c8df6..05ebd1ede2 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -284,13 +284,19 @@ void Read16(u16& _rReturnValue, const u32 _Address)
 		return;
 
 	case FIFO_READ_POINTER_LO:
-		_rReturnValue = ReadLow (fifo.CPReadPointer);
+		if (IsOnThread())
+			_rReturnValue = ReadLow (fifo.SafeCPReadPointer);
+		else
+			_rReturnValue = ReadLow (fifo.CPReadPointer);
 		// hack: CPU will always believe fifo is empty and on idle
 		//_rReturnValue = ReadLow (fifo.CPWritePointer);
 		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
 		return;
 	case FIFO_READ_POINTER_HI:
-		_rReturnValue = ReadHigh(fifo.CPReadPointer);
+		if (IsOnThread())
+			_rReturnValue = ReadHigh (fifo.SafeCPReadPointer);
+		else
+			_rReturnValue = ReadHigh (fifo.CPReadPointer);
 		// hack: CPU will always believe fifo is empty and on idle
 	    //_rReturnValue = ReadHigh(fifo.CPWritePointer);
 		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
@@ -614,8 +620,11 @@ void Write16(const u16 _Value, const u32 _Address)
 		{
 			GPFifo::ResetGatherPipe();
 			ResetVideoBuffer();
-			IncrementCheckContextId();
-		}		
+		}else
+		{
+			ResetVideoBuffer();		
+		}
+		IncrementCheckContextId();
 		DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_LO : %04x", _Value);
 		break;
 
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index 18daeec5b7..f459fd4ef6 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -169,7 +169,8 @@ void Fifo_EnterLoop()
 
 			Common::AtomicStore(_fifo.CPReadPointer, readPtr);
 			Common::AtomicAdd(_fifo.CPReadWriteDistance, -distToSend);						
-		    			
+			if((FAKE_GetFifoEndPtr() - g_pVideoData) == 0)
+				Common::AtomicStore(_fifo.SafeCPReadPointer, _fifo.CPReadPointer);
 			CommandProcessor::SetStatus();
 		
 			// This call is pretty important in DualCore mode and must be called in the FIFO Loop.