diff --git a/src/dispatch.c b/src/dispatch.c
index 4fb4304e..4e831d6f 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -133,7 +133,7 @@ int daap_auth(WS_CONNINFO *pwsc, char *username, char *password) {
     readpassword = conf_alloc_string("general","password",NULL);
 
     if(password == NULL) {
-        if(readpassword == NULL) {
+        if((readpassword == NULL)||(strlen(readpassword) == 0)) {
             return TRUE;
         } else {
             free(readpassword);