diff --git a/src/ympd.c b/src/ympd.c
index 1252cb5..53f59bc 100644
--- a/src/ympd.c
+++ b/src/ympd.c
@@ -132,7 +132,8 @@ int main(int argc, char **argv)
                 run_as_user = strdup(optarg);
                 break;
             case 'm':
-                mpd.password = strdup(optarg);
+                if (strlen(optarg) > 0)
+                    mpd.password = strdup(optarg);
                 break;
             case 'v':
                 fprintf(stdout, "ympd  %d.%d.%d\n"