diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
index 33470ef..5abfc5c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
@@ -142,7 +142,7 @@
       ObjectId commitId = repo.resolve(ref);
       if (commitId != null) {
         // this image exists already
-        return getUrl(pc.getProject().getNameKey(), commitId.getName(), fileName);
+        return getUrl(pc.getProject().getNameKey(), ref, fileName);
       }
 
       RevWalk rw = new RevWalk(repo);
@@ -183,7 +183,7 @@
                 pc.getProject().getName(), ru.getResult()));
           }
 
-          return getUrl(pc.getProject().getNameKey(), commitId.getName(), fileName);
+          return getUrl(pc.getProject().getNameKey(), ref, fileName);
         } finally {
           oi.release();
         }
