diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_d3d10.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_d3d10.cpp
index 61f874009c..e0063bc7b2 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_d3d10.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_d3d10.cpp
@@ -646,8 +646,8 @@ void SyncD3D10Objects(std::vector<amd::Memory*>& memObjects)
         return;
     }
     query->End();
-    BOOL data;
-    while(S_OK != query->GetData(&data, sizeof(BOOL), 0) && data != TRUE)
+    BOOL data = FALSE;
+    while(S_OK != query->GetData(&data, sizeof(BOOL), 0))
     {
     }
 }
diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_d3d11.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_d3d11.cpp
index 445e9d2db7..58e99237f5 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_d3d11.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_d3d11.cpp
@@ -1004,19 +1004,19 @@ D3D11Object::copyOrigToShared()
     // Any usage source can be read by GPU
     pImmediateContext->CopySubresourceRegion(pD3D11Res_, 0, 0, 0, 0,
         pD3D11ResOrig_, subRes_, NULL);
-    pImmediateContext->Release();
 
      // Flush D3D queues and make sure D3D stuff is finished
     {
-        ScopedLock sl(resLock_);//protect from multiple 
+        ScopedLock sl(resLock_);//protect from multiple
         pImmediateContext->Flush();
         pImmediateContext->End(pQuery_);
-        BOOL data;
-        while(S_OK != pImmediateContext->GetData(pQuery_, &data, sizeof(BOOL), 0) && data != TRUE)
+        BOOL data = FALSE;
+        while(S_OK != pImmediateContext->GetData(pQuery_, &data, sizeof(BOOL), 0));
         {
         }
     }
 
+    pImmediateContext->Release();
     d3dDev->Release();
     return true;
 }
diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
index 388b863ab6..2e64268005 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
@@ -329,8 +329,8 @@ void SyncD3D9Objects(std::vector<amd::Memory*>& memObjects)
     }
     ScopedLock sl(d3d9Obj->getResLock());
     query->Issue(D3DISSUE_END);
-    BOOL data;
-    while(S_OK != query->GetData(&data, sizeof(BOOL), D3DGETDATA_FLUSH) && data != TRUE)
+    BOOL data = FALSE;
+    while(S_OK != query->GetData(&data, sizeof(BOOL), D3DGETDATA_FLUSH))
     {
     }
 }