diff --git a/runtime/gtpin/gtpin_callbacks.cpp b/runtime/gtpin/gtpin_callbacks.cpp
index e616231848..9bb2714c77 100644
--- a/runtime/gtpin/gtpin_callbacks.cpp
+++ b/runtime/gtpin/gtpin_callbacks.cpp
@@ -153,7 +153,7 @@ void gtpinNotifyKernelSubmit(cl_kernel kernel, void *pCmdQueue) {
         void *pSurfaceState = gtpinHelper.getSurfaceState(pKernel, gtpinBTI);
         cl_mem buffer = (cl_mem)resource;
         auto pBuffer = castToObjectOrAbort<Buffer>(buffer);
-        pBuffer->setArgStateful(const_cast<void *>(pSurfaceState));
+        pBuffer->setArgStateful(pSurfaceState);
     }
 }
 
diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp
index ac39b1639b..4ef487d006 100644
--- a/runtime/kernel/kernel.cpp
+++ b/runtime/kernel/kernel.cpp
@@ -1125,7 +1125,7 @@ cl_int Kernel::setArgBuffer(uint32_t argIndex,
 
         if (requiresSshForBuffers()) {
             auto surfaceState = ptrOffset(getSurfaceStateHeap(), kernelArgInfo.offsetHeap);
-            buffer->setArgStateful(const_cast<void *>(surfaceState));
+            buffer->setArgStateful(surfaceState);
         }
 
         return CL_SUCCESS;
@@ -1229,9 +1229,9 @@ cl_int Kernel::setArgImageWithMipLevel(uint32_t argIndex,
         // Sets SS structure
         if (kernelArgInfo.isMediaImage) {
             DEBUG_BREAK_IF(!kernelInfo.isVmeWorkload);
-            pImage->setMediaImageArg(const_cast<void *>(surfaceState));
+            pImage->setMediaImageArg(surfaceState);
         } else {
-            pImage->setImageArg(const_cast<void *>(surfaceState), kernelArgInfo.isMediaBlockImage, mipLevel);
+            pImage->setImageArg(surfaceState, kernelArgInfo.isMediaBlockImage, mipLevel);
         }
 
         auto crossThreadData = reinterpret_cast<uint32_t *>(getCrossThreadData());