diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp
index ccf7da36e..1607e0555 100644
--- a/src/detection/os/os_windows.cpp
+++ b/src/detection/os/os_windows.cpp
@@ -59,10 +59,11 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
         ffStrbufClear(&os->variant);
     }
 
-    if(getenv("MSYSTEM"))
+    #ifdef __MSYS__
         ffStrbufAppendS(&os->id, "MSYS2");
-    else
+    #else
         ffStrbufAppendF(&os->id, "Windows %*s", os->version.length, os->version.chars);
+    #endif
 
     ffGetWmiObjString(pclsObj, L"BuildNumber", &os->buildID);
     ffGetWmiObjString(pclsObj, L"OSArchitecture", &os->architecture);