diff --git a/server/mdm/mdm.go b/server/mdm/mdm.go
index aaebd2300b..3cf0f856cd 100644
--- a/server/mdm/mdm.go
+++ b/server/mdm/mdm.go
@@ -65,7 +65,7 @@ func GetRawProfilePlatform(profile []byte) string {
 		return "darwin"
 	}
 
-	if prefixMatches(trimmedProfile, "<replace") || prefixMatches(trimmedProfile, "<add") {
+	if prefixMatches(trimmedProfile, "<replace") || prefixMatches(trimmedProfile, "<add") || prefixMatches(trimmedProfile, "<!--") {
 		return "windows"
 	}
 
diff --git a/server/mdm/mdm_test.go b/server/mdm/mdm_test.go
index 84e01ed066..402fd74574 100644
--- a/server/mdm/mdm_test.go
+++ b/server/mdm/mdm_test.go
@@ -154,6 +154,11 @@ func TestGetRawProfilePlatform(t *testing.T) {
 			input:    []byte("<Add this=\"that\">"),
 			expected: "windows",
 		},
+		{
+			name:     "Windows xml with comment",
+			input:    []byte("<!-- this is a comment -->"),
+			expected: "windows",
+		},
 		{
 			name:     "Whitespace before prefix",
 			input:    []byte("   <?xml version=\"1.0\"?>"),