diff --git a/pom.xml b/pom.xml
index ebffe78d5..8a59a5cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>com.sonymobile.tools.gerrit</groupId>
             <artifactId>gerrit-events</artifactId>
-            <version>2.19.0</version>
+            <version>2.21.0</version>
             <exclusions>
                 <!-- Provided by core -->
                 <exclusion>
diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginPatchsetCreatedEvent.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginPatchsetCreatedEvent.java
index a76881fdd..702e46d30 100644
--- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginPatchsetCreatedEvent.java
+++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginPatchsetCreatedEvent.java
@@ -253,11 +253,13 @@ public boolean shouldTriggerOn(GerritTriggeredEvent event) {
             return true;
         }
         if (excludeTrivialRebase
-                && GerritChangeKind.TRIVIAL_REBASE == ((PatchsetCreated)event).getPatchSet().getKind()) {
+                && (GerritChangeKind.TRIVIAL_REBASE == ((PatchsetCreated)event).getPatchSet().getKind()
+                || GerritChangeKind.NO_CHANGE == ((PatchsetCreated)event).getPatchSet().getKind())) {
             return false;
         }
         if (excludeNoCodeChange
-                && GerritChangeKind.NO_CODE_CHANGE == ((PatchsetCreated)event).getPatchSet().getKind()) {
+                && (GerritChangeKind.NO_CODE_CHANGE == ((PatchsetCreated)event).getPatchSet().getKind()
+                || GerritChangeKind.NO_CHANGE == ((PatchsetCreated)event).getPatchSet().getKind())) {
             return false;
         }
         if (excludePrivateState && ((PatchsetCreated)event).getChange().isPrivate()) {
diff --git a/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/event/PluginPatchsetCreatedEventTest.java b/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/event/PluginPatchsetCreatedEventTest.java
index 778a79d3f..6636123f4 100644
--- a/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/event/PluginPatchsetCreatedEventTest.java
+++ b/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/event/PluginPatchsetCreatedEventTest.java
@@ -54,6 +54,7 @@ public void shouldNotFireOnDraftPatchsetWhenExcluded() {
 
     /**
      * Tests that it should not fire on trivial rebase when they are excluded.
+     * Also tests that we don't fire for no change while ignoring trivial rebases.
      * @author Doug Kelly &lt;dougk.ff7@gmail.com&gt;
      */
     @Test
@@ -68,10 +69,13 @@ public void shouldNotFireOnTrivialRebaseWhenExcluded() {
         assertTrue(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
         patchsetCreated.getPatchSet().setKind(GerritChangeKind.TRIVIAL_REBASE);
         assertFalse(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
+        patchsetCreated.getPatchSet().setKind(GerritChangeKind.NO_CHANGE);
+        assertFalse(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
     }
 
     /**
      * Tests that it should not fire on no code changes when they are excluded.
+     * Also tests that we don't fire for no change while ignoring no code change.
      * @author Doug Kelly &lt;dougk.ff7@gmail.com&gt;
      */
     @Test
@@ -86,6 +90,8 @@ public void shouldNotFireOnNoCodeChangeWhenExcluded() {
         assertTrue(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
         patchsetCreated.getPatchSet().setKind(GerritChangeKind.NO_CODE_CHANGE);
         assertFalse(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
+        patchsetCreated.getPatchSet().setKind(GerritChangeKind.NO_CHANGE);
+        assertFalse(pluginPatchsetCreatedEvent.shouldTriggerOn(patchsetCreated));
     }
 
     /**