diff --git a/AutoStart/AutoStart-Windows.cpp b/AutoStart/AutoStart-Windows.cpp
index 3296c45f..8ca7cd8b 100644
--- a/AutoStart/AutoStart-Windows.cpp
+++ b/AutoStart/AutoStart-Windows.cpp
@@ -83,7 +83,7 @@ bool AutoStart::EnableAutoStart(AutoStartInfo autostart_info)
         if(result == CO_E_NOTINITIALIZED)
         {
             weInitialised                           = true;
-            CoInitializeEx(NULL, COINIT_MULTITHREADED);
+            CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
             result                                  = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_ALL, IID_IShellLinkW, (void**)&shellLink);
         }
 
diff --git a/wmi/acpiwmi.cpp b/wmi/acpiwmi.cpp
index d6b53aa9..0b9c2eef 100644
--- a/wmi/acpiwmi.cpp
+++ b/wmi/acpiwmi.cpp
@@ -103,7 +103,7 @@ static bool OpenNotebook()
 
 bool AsWMI_Open()
 {
-    HRESULT init = CoInitializeEx(0, COINIT_MULTITHREADED);
+    HRESULT init = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
     if ( init < 0 && init != -2147417850 )
         return 0;
     coInitialized = 1;
diff --git a/wmi/wmi.cpp b/wmi/wmi.cpp
index 2678202a..3bda9e23 100644
--- a/wmi/wmi.cpp
+++ b/wmi/wmi.cpp
@@ -56,7 +56,7 @@ HRESULT Wmi::init()
     }
 
     // Initialize COM. ------------------------------------------
-    hres = CoInitializeEx(0, COINIT_MULTITHREADED);
+    hres = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
     if (FAILED(hres))
     {
         return hres;
@@ -149,7 +149,7 @@ HRESULT Wmi::query(std::string queryStr, std::vector<QueryObj>& queryVectorOut,
     IEnumWbemClassObject* pEnumerator = nullptr;
 
     // Initialize COM. ------------------------------------------
-    hres = CoInitializeEx(0, COINIT_MULTITHREADED);
+    hres = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
     if (FAILED(hres))
     {
         return hres;