diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h
index 414f3f4d7436..5c841b186ed5 100644
--- a/drivers/gpu/arm/bifrost/mali_kbase_fence.h
+++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h
@@ -143,7 +143,8 @@ static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom,
 	  KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE)
 	fence_set_error(katom->dma_fence.fence, status);
 #elif (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE)
-	dma_fence_set_error(katom->dma_fence.fence, status);
+	if (status < 0)
+		dma_fence_set_error(katom->dma_fence.fence, status);
 #else
 	katom->dma_fence.fence->status = status;
 #endif