diff --git a/src/gpu-compute/fetch_unit.cc b/src/gpu-compute/fetch_unit.cc
index 4ac762f1deb..48ed3a36f68 100644
--- a/src/gpu-compute/fetch_unit.cc
+++ b/src/gpu-compute/fetch_unit.cc
@@ -585,12 +585,12 @@ FetchUnit::FetchBufDesc::decodeInsts()
 {
     assert(readPtr);
 
-    if (splitDecode()) {
+    if (!wavefront->stopFetch() && splitDecode()) {
         decodeSplitInst();
     }
 
     while (wavefront->instructionBuffer.size() < maxIbSize &&
-           hasFetchDataToProcess()) {
+           hasFetchDataToProcess() && !wavefront->stopFetch()) {
         if (splitDecode()) {
             decodeSplitInst();
         } else {