diff --git a/tools/release.sh b/tools/release.sh
index 23b05b4fe8e1ef..397d3d466df785 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -69,15 +69,8 @@ function sign {
 
   local version=$1
 
-  gpgtagkey=$(git tag -v $version 2>&1 | grep 'key ID' | awk '{print $NF}')
-
-  if [ "X${gpgtagkey}" == "X" ]; then
-    echo "Could not find signed tag for \"${version}\""
-    exit 1
-  fi
-
-  if [ "${gpgtagkey}" != "${gpgkey}" ]; then
-    echo "GPG key for \"${version}\" tag is not yours, cannot sign"
+  if ! git tag -v $version 2>&1 | grep "${gpgkey}" | grep key > /dev/null; then
+    echo "Could not find signed tag for \"${version}\" or GPG key is not yours"
     exit 1
   fi