diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index 3d9f2b2b..e251f0db 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -31,7 +31,7 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
 }
 
 auto ALabel::update() -> void {
-  // Nothing here
+  AModule::update();
 }
 
 std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_t max) {
diff --git a/src/AModule.cpp b/src/AModule.cpp
index da43259d..3066bfc1 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -29,7 +29,10 @@ AModule::~AModule() {
 }
 
 auto AModule::update() -> void {
-  pid_.push_back(util::command::forkExec(config_["on-update"].asString()));
+  // Run user-provided update handler if configured
+  if (config_["on-update"].isString()) {
+    pid_.push_back(util::command::forkExec(config_["on-update"].asString()));
+  }
 }
 
 bool AModule::handleToggle(GdkEventButton* const& e) {
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 8b63bd6c..759c7c60 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -192,6 +192,8 @@ auto waybar::modules::Backlight::update() -> void {
   }
   previous_best_ = best == nullptr ? std::nullopt : std::optional{*best};
   previous_format_ = format_;
+  // Call parent update
+  ALabel::update();
 }
 
 template <class ForwardIt>
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index b50c38a6..632abd97 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -149,11 +149,6 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai
 }
 
 auto waybar::modules::Battery::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   auto [capacity, time_remaining, status] = getInfos();
   if (status == "Unknown") {
     status = getAdapterStatus(capacity);
@@ -192,4 +187,6 @@ auto waybar::modules::Battery::update() -> void {
                                   fmt::arg("icon", getIcon(capacity, state)),
                                   fmt::arg("time", formatTimeRemaining(time_remaining))));
   }
+  // Call parent update
+  ALabel::update();
 }
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 5a781ef7..4e058683 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -13,11 +13,6 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
 }
 
 auto waybar::modules::Clock::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   tzset(); // Update timezone information
   auto now = std::chrono::system_clock::now();
   auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
@@ -33,4 +28,6 @@ auto waybar::modules::Clock::update() -> void {
       label_.set_tooltip_text(text);
     }
   }
+  // Call parent update
+  ALabel::update();
 }
diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp
index 33d0d531..a0f646f5 100644
--- a/src/modules/cpu.cpp
+++ b/src/modules/cpu.cpp
@@ -10,11 +10,6 @@ waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
 }
 
 auto waybar::modules::Cpu::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
   auto cpu_load = getCpuLoad();
   auto [cpu_usage, tooltip] = getCpuUsage();
@@ -23,6 +18,8 @@ auto waybar::modules::Cpu::update() -> void {
   }
   label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
   getState(cpu_usage);
+  // Call parent update
+  ALabel::update();
 }
 
 uint16_t waybar::modules::Cpu::getCpuLoad() {
diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 1853b2fa..7a664474 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -93,11 +93,6 @@ bool waybar::modules::Custom::handleToggle(GdkEventButton* const& e) {
 }
 
 auto waybar::modules::Custom::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   // Hide label if output is empty
   if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
     event_box_.hide();
@@ -133,6 +128,8 @@ auto waybar::modules::Custom::update() -> void {
       event_box_.show();
     }
   }
+  // Call parent update
+  ALabel::update();
 }
 
 void waybar::modules::Custom::parseOutputRaw() {
diff --git a/src/modules/disk.cpp b/src/modules/disk.cpp
index 811fe729..87240dee 100644
--- a/src/modules/disk.cpp
+++ b/src/modules/disk.cpp
@@ -73,4 +73,6 @@ auto waybar::modules::Disk::update() -> void {
       ));
   }
   event_box_.show();
+  // Call parent update
+  ALabel::update();
 }
diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp
index c39e0114..d94e9579 100644
--- a/src/modules/idle_inhibitor.cpp
+++ b/src/modules/idle_inhibitor.cpp
@@ -26,17 +26,14 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
 }
 
 auto waybar::modules::IdleInhibitor::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   label_.set_markup(
       fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_))));
   label_.get_style_context()->add_class(status_);
   if (tooltipEnabled()) {
     label_.set_tooltip_text(status_);
   }
+  // Call parent update
+  ALabel::update();
 }
 
 bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
diff --git a/src/modules/memory.cpp b/src/modules/memory.cpp
index 3e1ed746..c5b8b409 100644
--- a/src/modules/memory.cpp
+++ b/src/modules/memory.cpp
@@ -9,11 +9,6 @@ waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config
 }
 
 auto waybar::modules::Memory::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   parseMeminfo();
   if (memtotal_ > 0 && memfree_ >= 0) {
     auto total_ram_gigabytes = memtotal_ / std::pow(1024, 2);
@@ -35,6 +30,8 @@ auto waybar::modules::Memory::update() -> void {
   } else {
     event_box_.hide();
   }
+  // Call parent update
+  ALabel::update();
 }
 
 void waybar::modules::Memory::parseMeminfo() {
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index f61dfc40..6dca5eea 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -35,11 +35,6 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
 }
 
 auto waybar::modules::MPD::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   std::lock_guard guard(connection_lock_);
   tryConnect();
 
@@ -61,6 +56,9 @@ auto waybar::modules::MPD::update() -> void {
   }
 
   setLabel();
+
+  // Call parent update
+  ALabel::update();
 }
 
 std::thread waybar::modules::MPD::event_listener() {
diff --git a/src/modules/network.cpp b/src/modules/network.cpp
index 9513a93d..54a92ba5 100644
--- a/src/modules/network.cpp
+++ b/src/modules/network.cpp
@@ -228,11 +228,6 @@ const std::string waybar::modules::Network::getNetworkState() const {
 }
 
 auto waybar::modules::Network::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   std::lock_guard<std::mutex> lock(mutex_);
   std::string                 tooltip_format;
   auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
@@ -314,6 +309,9 @@ auto waybar::modules::Network::update() -> void {
       label_.set_tooltip_text(text);
     }
   }
+
+  // Call parent update
+  ALabel::update();
 }
 
 // Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index e336825c..06c0ad81 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -196,11 +196,6 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const {
 }
 
 auto waybar::modules::Pulseaudio::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   auto format = format_;
   std::string format_name = "format";
   if (monitor_.find("a2dp_sink") != std::string::npos) {
@@ -215,7 +210,7 @@ auto waybar::modules::Pulseaudio::update() -> void {
   } else {
     label_.get_style_context()->remove_class("muted");
   }
-  format = 
+  format =
     config_[format_name].isString() ? config_[format_name].asString() : format;
   // TODO: find a better way to split source/sink
   std::string format_source = "{volume}%";
@@ -234,4 +229,7 @@ auto waybar::modules::Pulseaudio::update() -> void {
   if (tooltipEnabled()) {
     label_.set_tooltip_text(desc_);
   }
+
+  // Call parent update
+  ALabel::update();
 }
diff --git a/src/modules/sway/mode.cpp b/src/modules/sway/mode.cpp
index cd02c0ca..33e4f722 100644
--- a/src/modules/sway/mode.cpp
+++ b/src/modules/sway/mode.cpp
@@ -51,6 +51,8 @@ auto Mode::update() -> void {
     }
     event_box_.show();
   }
+  // Call parent update
+  ALabel::update();
 }
 
 }  // namespace waybar::modules::sway
diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp
index 2e4ec468..1f90ebaf 100644
--- a/src/modules/sway/window.cpp
+++ b/src/modules/sway/window.cpp
@@ -64,6 +64,8 @@ auto Window::update() -> void {
   if (tooltipEnabled()) {
     label_.set_tooltip_text(window_);
   }
+  // Call parent update
+  ALabel::update();
 }
 
 std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index b65e47db..d0c8cc3c 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -176,6 +176,8 @@ auto Workspaces::update() -> void {
     }
     onButtonReady(*it, button);
   }
+  // Call parent update
+  AModule::update();
 }
 
 Gtk::Button &Workspaces::addButton(const Json::Value &node) {
diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index d17c2ad8..5508fd2b 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -19,11 +19,6 @@ waybar::modules::Temperature::Temperature(const std::string& id, const Json::Val
 }
 
 auto waybar::modules::Temperature::update() -> void {
-  // Run user-provided update handler if configured
-  if (config_["on-update"].isString()) {
-    AModule::update();
-  }
-
   auto [temperature_c, temperature_f] = getTemperature();
   auto critical = isCritical(temperature_c);
   auto format = format_;
@@ -38,6 +33,8 @@ auto waybar::modules::Temperature::update() -> void {
                                 fmt::arg("temperatureC", temperature_c),
                                 fmt::arg("temperatureF", temperature_f),
                                 fmt::arg("icon", getIcon(temperature_c, "", max_temp))));
+  // Call parent update
+  ALabel::update();
 }
 
 std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {