diff --git a/driver-opencl.c b/driver-opencl.c
index d558a820..7912a38b 100644
--- a/driver-opencl.c
+++ b/driver-opencl.c
@@ -1465,10 +1465,9 @@ static void opencl_free_work(struct thr_info *thr, struct work *work)
 	_clState *clState = clStates[thr_id];
 	struct cgpu_info *gpu = thr->cgpu;
 
-	if (gpu->dynamic)
-		return;
+	if (!gpu->dynamic)
+		clFinish(clState->commandQueue);
 
-	clFinish(clState->commandQueue);
 	if (thrdata->res[FOUND]) {
 		thrdata->last_work = &thrdata->_last_work;
 		memcpy(thrdata->last_work, work, sizeof(*thrdata->last_work));