diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index b896a119a..2833af430 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -257,11 +257,13 @@ cmd-git-public-key() {
   local cmd="git:public-key"
   [[ "$1" == "$cmd" ]] && shift 1
 
-  if [[ ! -f "$DOKKU_ROOT/.ssh/id_rsa.pub" ]] && [[ ! -f "$DOKKU_ROOT/.ssh/id_ed25519.pub" ]] ; then
+  if [[ -f "$DOKKU_ROOT/.ssh/id_ed25519.pub" ]] ; then
+    cat "$DOKKU_ROOT/.ssh/id_ed25519.pub"
+  elif [[ -f "$DOKKU_ROOT/.ssh/id_rsa.pub" ]]; then
+    cat "$DOKKU_ROOT/.ssh/id_rsa.pub"
+  else
     fn-git-auth-error
   fi
-
-  cat "$DOKKU_ROOT/.ssh/id_rsa.pub"
 }
 
 cmd-git-report() {