diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp
index 1698d2d4..be596c02 100644
--- a/include/modules/mpd.hpp
+++ b/include/modules/mpd.hpp
@@ -82,6 +82,11 @@ namespace modules {
       }
     }
 
+    void teardown() {
+      wakeup();
+      m_mpd.reset();
+    }
+
     inline bool connected() const {
       return m_mpd && m_mpd->connected();
     }