diff --git a/src/main/java/org/jfrog/hudson/ArtifactoryServer.java b/src/main/java/org/jfrog/hudson/ArtifactoryServer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jfrog/hudson/ArtifactoryServer.java
+++ b/src/main/java/org/jfrog/hudson/ArtifactoryServer.java
@@ -284,11 +284,11 @@ public class ArtifactoryServer implements Serializable {
      * @return Preferred credentials for repo resolving. Never null.
      */
     public Credentials getResolvingCredentials() {
-        if (getResolverCredentials() != null) {
+        if (StringUtils.isNotBlank(getResolverCredentialsId())) {
             return getResolverCredentials();
         }
 
-        if (getDeployerCredentials() != null) {
+        if (StringUtils.isNotBlank(getDeployerCredentialsId())) {
             return getDeployerCredentials();
         }
HAP-<I> - Add support with Credentials plugin for Artifactory