diff --git a/Source/Engine/Content/Asset.cpp b/Source/Engine/Content/Asset.cpp
index 5f11cfb54..9bad11533 100644
--- a/Source/Engine/Content/Asset.cpp
+++ b/Source/Engine/Content/Asset.cpp
@@ -225,7 +225,7 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds)
         while (!Engine::ShouldExit())
         {
             // Try to execute content tasks
-            while (task->IsQueued())
+            while (task->IsQueued() && !Engine::ShouldExit())
             {
                 // Pick this task from the queue
                 ContentLoadTask* tmp;