diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
index eda8ab05..d763259b 100644
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@@ -66,7 +66,7 @@ class UPower : public AModule {
   Devices devices;
   std::mutex m_Mutex;
   UpClient *client;
-  UpDevice *displayDevice;
+  UpDevice *displayDevice = nullptr;
   guint login1_id;
   GDBusConnection *login1_connection;
   std::unique_ptr<UPowerTooltip> upower_tooltip;
diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 9a8b89e7..0eaf264a 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -527,11 +527,11 @@ void Task::handle_closed() {
   spdlog::debug("{} closed", repr());
   zwlr_foreign_toplevel_handle_v1_destroy(handle_);
   handle_ = nullptr;
-  tbar_->remove_task(id_);
   if (button_visible_) {
     tbar_->remove_button(button);
     button_visible_ = false;
   }
+  tbar_->remove_task(id_);
 }
 
 bool Task::handle_clicked(GdkEventButton *bt) {