diff --git a/services/sonar/sonar-base.js b/services/sonar/sonar-base.js
index 4e13f25e24d4fb2e4a05307b02cb0245dc6ebfd8..72139f14f9aea01cc2c7e634c7120a0462c708d4 100644
--- a/services/sonar/sonar-base.js
+++ b/services/sonar/sonar-base.js
@@ -68,8 +68,11 @@ export default class SonarBase extends BaseJsonService {
     } else {
       schema = modernSchema
       url = `${server}/api/measures/component`
+      // componentKey query param was renamed in version 6.6
+      const componentKey =
+        parseFloat(sonarVersion) >= 6.6 ? 'component' : 'componentKey'
       qs = {
-        componentKey: component,
+        [componentKey]: component,
         metricKeys: metricName,
       }
     }