diff --git a/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritHttpCredentials.java b/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritHttpCredentials.java
index 74e5a2c4..3af924bc 100644
--- a/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritHttpCredentials.java
+++ b/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritHttpCredentials.java
@@ -37,7 +37,8 @@ public static GerritHttpCredentials get() {
 
   /** @return Empty if username and password are null */
   public Optional<String> migrate(String username, Secret password) {
-    if (Util.fixEmpty(username) == null && password == null) {
+    if (Util.fixEmpty(username) == null
+        && (password == null || Util.fixEmpty(password.getPlainText()) == null)) {
       return Optional.empty();
     }
     StandardUsernamePasswordCredentials credentials =