diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java
index a9ce189250..9c01bb40c5 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java
@@ -105,6 +105,8 @@ public class GitHookTagProvider implements HookTagProvider {
     final RevObject revObject = revWalk.parseAny(oldId);
     if (revObject instanceof RevTag) {
       return unpeelTag(revWalk, ((RevTag) revObject).getObject());
+    } else if (revObject == null) {
+      return oldId;
     } else {
       return revObject;
     }