diff --git a/src/mpd_client.c b/src/mpd_client.c
index 0da2297..ea10178 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -55,7 +55,6 @@ int callback_mpd(struct mg_connection *c)
         cmd_id != MPD_API_GET_MPDHOST && cmd_id != MPD_API_SET_MPDPASS)
         return MG_TRUE;
 
-    mpd_connection_set_timeout(mpd.conn, 10000);
     switch(cmd_id)
     {
         case MPD_API_UPDATE_DB:
@@ -287,6 +286,7 @@ void mpd_poll(struct mg_server *s)
             }
 
             fprintf(stderr, "MPD connected.\n");
+            mpd_connection_set_timeout(mpd.conn, 10000);
             mpd.conn_state = MPD_CONNECTED;
             break;