diff --git a/include/interfaces/mpd.hpp b/include/interfaces/mpd.hpp
index a1a6aa43..20bd2909 100644
--- a/include/interfaces/mpd.hpp
+++ b/include/interfaces/mpd.hpp
@@ -92,6 +92,8 @@ namespace mpd
     void set(std::unique_ptr<struct mpd_status, StatusDeleter> status);
 
     void update(int event, std::unique_ptr<Connection>& connection);
+    void update(int event, Connection *connection);
+
     void update_timer();
 
     // unsigned get_total_time();
@@ -145,7 +147,9 @@ namespace mpd
       void set_password(std::string password) { this->password = password; }
       void set_timeout(int timeout) { this->timeout = timeout; }
 
-      std::unique_ptr<Status> get_status();
+      std::unique_ptr<Status> get_status(bool update = true);
+      std::unique_ptr<Status> get_status_safe(bool update = true);
+
       std::unique_ptr<Song> get_song();
 
       void play();
diff --git a/src/interfaces/mpd.cpp b/src/interfaces/mpd.cpp
index 6b0e6605..0b873156 100644
--- a/src/interfaces/mpd.cpp
+++ b/src/interfaces/mpd.cpp
@@ -197,7 +197,7 @@ namespace mpd
   void Connection::seek(int percentage)
   {
     try {
-      auto status = this->get_status();
+      auto status = this->get_status(false);
       if (status->total_time == 0)
         return;
       if (percentage < 0)
@@ -249,12 +249,24 @@ namespace mpd
 
   // Status
 
-  std::unique_ptr<Status> Connection::get_status()
+  std::unique_ptr<Status> Connection::get_status(bool update)
   {
     this->check_prerequisites();
-    mpd_status *status = mpd_run_status(this->connection.get());
+    mpd_status *mpd_status = mpd_run_status(this->connection.get());
     this->check_errors();
-    return std::make_unique<Status>(status);
+    auto status = std::make_unique<Status>(mpd_status);
+    if (update)
+      status->update(-1, this);
+    return status;
+  }
+
+  std::unique_ptr<Status> Connection::get_status_safe(bool update)
+  {
+    std::unique_ptr<Status> status;
+    try {
+      status = this->get_status(update);
+    } catch (mpd::Exception &e) {}
+    return status;
   }
 
   Status::Status(struct mpd_status *status) {
@@ -275,11 +287,18 @@ namespace mpd
     this->updated_at = std::chrono::system_clock::now();
   }
 
-  void Status::update(int event, std::unique_ptr<Connection>& connection)
+  void Status::update(int event, std::unique_ptr<Connection>& connection) {
+    return this->update(event, connection.get());
+  }
+
+  void Status::update(int event, Connection *connection)
   {
-    auto status = connection->get_status();
+    if (connection == nullptr)
+      return;
 
     if (event & (MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS)) {
+      auto status = connection->get_status(false);
+
       this->set(std::move(status->status));
       this->elapsed_time_ms = this->elapsed_time * 1000;
 
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index 873b39f9..f1af9cfe 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -76,13 +76,11 @@ MpdModule::MpdModule(std::string name_)
 MpdModule::~MpdModule()
 {
   std::lock_guard<concurrency::SpinLock> lck(this->update_lock);
-  {
-    if (this->mpd && this->mpd->connected()) {
-      try {
-        this->mpd->disconnect();
-      } catch (mpd::Exception &e) {
-        get_logger()->debug(e.what());
-      }
+  if (this->mpd && this->mpd->connected()) {
+    try {
+      this->mpd->disconnect();
+    } catch (mpd::Exception &e) {
+      get_logger()->debug(e.what());
     }
   }
 }
@@ -97,10 +95,8 @@ void MpdModule::start()
   try {
     this->mpd->connect();
     this->status = this->mpd->get_status();
-    this->status->update(-1, this->mpd);
   } catch (mpd::Exception &e) {
     log_error(e.what());
-    this->mpd->disconnect();
   }
 
   this->EventModule::start();
@@ -125,14 +121,11 @@ bool MpdModule::has_event()
     }
   }
 
-  if (!this->connection_state_broadcasted) {
+  if (!this->connection_state_broadcasted)
     this->connection_state_broadcasted = true;
-  }
 
-  if (!this->status) {
-    this->status = this->mpd->get_status();
-    this->status->update(-1, this->mpd);
-  }
+  if (!this->status)
+    this->status = this->mpd->get_status_safe();
 
   try {
     this->mpd->idle();
@@ -140,7 +133,7 @@ bool MpdModule::has_event()
     int idle_flags;
 
     if ((idle_flags = this->mpd->noidle()) != 0) {
-      this->status->update(idle_flags, this->mpd);
+      this->status->update(idle_flags, this->mpd.get());
       has_event = true;
     } else if (this->status->state & mpd::PLAYING) {
       this->status->update_timer();
@@ -169,12 +162,7 @@ bool MpdModule::update()
     return true;
 
   if (!this->status)
-    try {
-      this->status = this->mpd->get_status();
-    } catch (mpd::Exception &e) {
-      log_trace(e.what());
-    }
-
+    this->status = this->mpd->get_status_safe();
   if (!this->status)
     return true;
 
@@ -184,7 +172,6 @@ bool MpdModule::update()
   try {
     elapsed_str = this->status->get_formatted_elapsed();
     total_str = this->status->get_formatted_total();
-
     song = this->mpd->get_song();
 
     if (*song) {
@@ -234,6 +221,7 @@ bool MpdModule::build(Builder *builder, std::string tag)
   };
 
   bool is_playing = false;
+  bool is_paused = false;
   bool is_stopped = true;
   int elapsed_percentage = 0;
 
@@ -242,6 +230,8 @@ bool MpdModule::build(Builder *builder, std::string tag)
 
     if (this->status->state & mpd::State::PLAYING)
       is_playing = true;
+    if (this->status->state & mpd::State::PAUSED)
+      is_paused = true;
     if (!(this->status->state & mpd::State::STOPPED))
       is_stopped = false;
   }
@@ -262,11 +252,11 @@ bool MpdModule::build(Builder *builder, std::string tag)
     icon_cmd(builder, EVENT_REPEAT_ONE, this->icons->get("repeat_one"));
   else if (tag == TAG_ICON_PREV)
     icon_cmd(builder, EVENT_PREV, this->icons->get("prev"));
-  else if (tag == TAG_ICON_STOP)
+  else if (tag == TAG_ICON_STOP && (is_playing || is_paused))
     icon_cmd(builder, EVENT_STOP, this->icons->get("stop"));
-  else if (tag == TAG_ICON_PAUSE || (tag == TAG_TOGGLE && is_playing))
+  else if ((tag == TAG_ICON_PAUSE || tag == TAG_TOGGLE) && is_playing)
     icon_cmd(builder, EVENT_PAUSE, this->icons->get("pause"));
-  else if (tag == TAG_ICON_PLAY || (tag == TAG_TOGGLE && !is_playing))
+  else if ((tag == TAG_ICON_PLAY || tag == TAG_TOGGLE) && !is_playing)
     icon_cmd(builder, EVENT_PLAY, this->icons->get("play"));
   else if (tag == TAG_ICON_NEXT)
     icon_cmd(builder, EVENT_NEXT, this->icons->get("next"));