diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h b/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
index 4f5cef42146..d340d47f08a 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
+++ b/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
@@ -67,7 +67,7 @@ protected:
 	{
 		Block res;
 
-		while (!res)
+		while (!res && !isCancelled())
 		{
 			if (!task && !getNewTask())
 				break;