diff --git a/src/mpd_client.c b/src/mpd_client.c
index 10180af..a640dab 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -55,6 +55,7 @@ int callback_mpd(struct mg_connection *c)
         cmd_id != MPD_API_GET_MPDHOST && cmd_id != MPD_API_SET_MPDPASS)
         return MG_CLIENT_CONTINUE;
 
+    mpd_connection_set_timeout(mpd.conn, 5000);
     switch(cmd_id)
     {
         case MPD_API_UPDATE_DB: