diff --git a/OpenAuraSDK/wmi.cpp b/OpenAuraSDK/wmi.cpp
index 7ca8e80d2..1ff143ac8 100644
--- a/OpenAuraSDK/wmi.cpp
+++ b/OpenAuraSDK/wmi.cpp
@@ -155,7 +155,7 @@ HRESULT Wmi::query(std::string queryStr, std::vector<QueryObj>& queryVectorOut,
 
     while (pEnumerator)
     {
-        hres = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
+        hres = pEnumerator->Next(WMI_WAIT_TIME, 1, &pclsObj, &uReturn);
 
         if (0==uReturn)
         {
diff --git a/OpenAuraSDK/wmi.h b/OpenAuraSDK/wmi.h
index 73bb7099f..cfa9d20aa 100644
--- a/OpenAuraSDK/wmi.h
+++ b/OpenAuraSDK/wmi.h
@@ -9,6 +9,8 @@
 #include <Wbemidl.h>
 #include <Windows.h>
 
+#define WMI_WAIT_TIME 2000 /// Max time to wait for next object in when enumerating next object in wmi query in milliseconds
+
 #pragma comment(lib, "wbemuuid.lib")