diff --git a/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java b/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java
index f390369..abb0a96 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java
@@ -106,7 +106,7 @@
     ChangeMessage message = new ChangeMessage(
         new ChangeMessage.Key(
             change.getId(),
-            ChangeUtil.messageUUID(dbProvider.get())),
+            ChangeUtil.messageUuid()),
         ((IdentifiedUser)userProvider.get()).getAccountId(),
         change.getLastUpdatedOn(),
         change.currentPatchSetId());