diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp
index 0de434b93d..c2ad1017f4 100644
--- a/Source/Core/Core/HW/GPFifo.cpp
+++ b/Source/Core/Core/HW/GPFifo.cpp
@@ -99,7 +99,11 @@ void GPFifoManager::UpdateGatherPipe()
 
     // increase the CPUWritePointer
     if (processor_interface.m_fifo_cpu_write_pointer == processor_interface.m_fifo_cpu_end)
+    {
+      if (!system.GetCommandProcessor().GetFifo().bFF_GPLinkEnable)
+        WARN_LOG_FMT(VIDEO, "write gather pipe wrapped while fifos are not linked");
       processor_interface.m_fifo_cpu_write_pointer = processor_interface.m_fifo_cpu_base;
+    }
     else
       processor_interface.m_fifo_cpu_write_pointer += GATHER_PIPE_SIZE;