diff --git a/src/Vulkan/VkQueryPool.cpp b/src/Vulkan/VkQueryPool.cpp
index 864ddb2..cd1041b 100644
--- a/src/Vulkan/VkQueryPool.cpp
+++ b/src/Vulkan/VkQueryPool.cpp
@@ -75,7 +75,7 @@
 			std::unique_lock<std::mutex> mutexLock(query.mutex);
 			if(flags & VK_QUERY_RESULT_WAIT_BIT) // Must wait for query to finish
 			{
-				query.condition.wait(mutexLock, [&query] { return query.state != Query::ACTIVE; });
+				query.condition.wait(mutexLock, [&query] { return query.state == Query::FINISHED; });
 			}
 
 			bool writeResult = true;
@@ -158,8 +158,6 @@
 		{
 			std::unique_lock<std::mutex> mutexLock(pool[i].mutex);
 
-			ASSERT(pool[i].state != Query::ACTIVE);
-
 			pool[i].state = Query::UNAVAILABLE;
 			pool[i].data = 0;
 		}