diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
index a531af0e53f62738def80eaa608a8800dd453975..0950e761560f2c94ea69b91fd7b2fbb29ff41aea 100644
--- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
+++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
@@ -82,9 +82,14 @@           if (otherRules.length !== rules.length) {
             return false
           }
 
+          let propertiesAreComparable = false
+
           for (let i = 0; i < otherRules.length; i++) {
             let otherRule = otherRules[i]
             let properties = getRuleProperties(otherRule)
+            if (info[i].properties.length > 0 && properties.length > 0) {
+              propertiesAreComparable = true
+            }
             if (!equal(info[i].properties, properties)) {
               return false
             }
@@ -92,6 +97,10 @@             let context = jit.getRuleContext(state, otherRule, otherClassName.className)
             if (!equal(info[i].context, context)) {
               return false
             }
+          }
+
+          if (!propertiesAreComparable) {
+            return false
           }
 
           return true