diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a5396c0faa9..8e2f1bd364e 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -80,6 +80,7 @@
     "enabled": false
   },
   "prConcurrentLimit": 10,
+  "rebaseWhen": "conflicted",
   "reviewers": ["team:grafana/frontend-ops"],
   "separateMajorMinor": false,
   "vulnerabilityAlerts": {