diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6bb179..f7c2ec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@
 
 * network: fix missing break in switch statement ([#377][377]).
 * i3/sway: crash when output is turned off an on ([#300][300]).
+* mpd: yambar never attempting to reconnect after MPD closed the
+  connection (for example, when MPD is restarted).
 
 [377]: https://codeberg.org/dnkl/yambar/issues/377
 [300]: https://codeberg.org/dnkl/yambar/issues/300
diff --git a/modules/mpd.c b/modules/mpd.c
index 22c0e6b..63da818 100644
--- a/modules/mpd.c
+++ b/modules/mpd.c
@@ -437,7 +437,7 @@ run(struct module *mod)
              */
             while (!aborted) {
                 struct pollfd fds[] = {{.fd = mod->abort_fd, .events = POLLIN}};
-                int res = poll(fds, sizeof(fds) / sizeof(fds[0]), 10 * 1000);
+                int res = poll(fds, sizeof(fds) / sizeof(fds[0]), 2 * 1000);
 
                 if (res < 0) {
                     if (errno == EINTR)
@@ -448,10 +448,16 @@ run(struct module *mod)
                     break;
                 }
 
-                if (res == 1) {
+                if (res == 0) {
+                    ret = 0;
+                    break;
+                }
+
+                else if (res == 1) {
                     assert(fds[0].revents & POLLIN);
                     aborted = true;
                 }
+
             }
         }