diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
index 660ce57..d551acc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
@@ -113,8 +113,7 @@
 
     try (final Repository git = repoManager.openRepository(projectName)) {
       try (final RevWalk rw = new RevWalk(git)) {
-        final ReviewDb reviewDb = schemaFactory.open();
-        try {
+        try (ReviewDb reviewDb = schemaFactory.open()) {
           Change.Id changeId = new Change.Id(Integer.parseInt(e.change.get().number));
           PatchSet.Id psId = new PatchSet.Id(changeId, Integer.parseInt(e.patchSet.get().number));
           PatchSet ps = reviewDb.patchSets().get(psId);
@@ -183,8 +182,6 @@
               }
             }
           });
-        } finally {
-          reviewDb.close();
         }
       }
     } catch (OrmException|IOException x) {
