diff --git a/jenkins/gerrit-codestyle-polygerrit-lint.sh b/jenkins/gerrit-codestyle-polygerrit-lint.sh
index 0a9078b..91a5fef 100644
--- a/jenkins/gerrit-codestyle-polygerrit-lint.sh
+++ b/jenkins/gerrit-codestyle-polygerrit-lint.sh
@@ -5,8 +5,9 @@
     [ "$TARGET_BRANCH" == "stable-3.2" ] || \
     [ "$TARGET_BRANCH" == "stable-3.1" ] || \
     [ "$TARGET_BRANCH" == "stable-3.0" ] || \
-    [ "$TARGET_BRANCH" == "stable-2.16" ]) \
-    && git show --diff-filter=AM --name-only --pretty="" HEAD | grep polygerrit-ui
+    [ "$TARGET_BRANCH" == "stable-2.16" ]) && \
+   ((git show --diff-filter=AM --name-only --pretty="" HEAD | grep polygerrit-ui) || \
+    (git show --summary HEAD | grep -q ^Merge:))
 then
   echo 'Running PolyGerrit lint check...'
   . set-java.sh 8