diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp
index 40406e96..6c17c6e4 100644
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@@ -42,7 +42,6 @@ class Custom : public ALabel {
   int pid_;
   util::command::res output_;
   util::JsonParser parser_;
-  int signal_;  // Cached signal value (-1 = disabled) to avoid JSON access in signal handler
 
   util::SleeperThread thread_;
 };
diff --git a/include/modules/image.hpp b/include/modules/image.hpp
index 40be856a..510dad94 100644
--- a/include/modules/image.hpp
+++ b/include/modules/image.hpp
@@ -33,7 +33,6 @@ class Image : public AModule {
   int size_;
   std::chrono::milliseconds interval_;
   util::command::res output_;
-  int signal_;  // Cached signal value (-1 = disabled) to avoid JSON access in signal handler
 
   util::SleeperThread thread_;
 };
diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index a3ea7b27..a01ca924 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -13,8 +13,7 @@ waybar::modules::Custom::Custom(const std::string& name, const std::string& id,
       tooltip_format_enabled_{config_["tooltip-format"].isString()},
       percentage_(0),
       fp_(nullptr),
-      pid_(-1),
-      signal_(config_["signal"].isInt() ? config_["signal"].asInt() : -1) {
+      pid_(-1) {
   if (config.isNull()) {
     spdlog::warn("There is no configuration for 'custom/{}', element will be hidden", name);
   }
@@ -137,7 +136,7 @@ void waybar::modules::Custom::waitingWorker() {
 }
 
 void waybar::modules::Custom::refresh(int sig) {
-  if (signal_ != -1 && sig == SIGRTMIN + signal_) {
+  if (config_["signal"].isInt() && sig == SIGRTMIN + config_["signal"].asInt()) {
     thread_.wake_up();
   }
 }
diff --git a/src/modules/image.cpp b/src/modules/image.cpp
index 4e830608..189deee6 100644
--- a/src/modules/image.cpp
+++ b/src/modules/image.cpp
@@ -1,9 +1,7 @@
 #include "modules/image.hpp"
 
 waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
-    : AModule(config, "image", id),
-      box_(Gtk::ORIENTATION_HORIZONTAL, 0),
-      signal_(config_["signal"].isInt() ? config_["signal"].asInt() : -1) {
+    : AModule(config, "image", id), box_(Gtk::ORIENTATION_HORIZONTAL, 0) {
   box_.pack_start(image_);
   box_.set_name("image");
   if (!id.empty()) {
@@ -43,7 +41,7 @@ void waybar::modules::Image::delayWorker() {
 }
 
 void waybar::modules::Image::refresh(int sig) {
-  if (signal_ != -1 && sig == SIGRTMIN + signal_) {
+  if (config_["signal"].isInt() && sig == SIGRTMIN + config_["signal"].asInt()) {
     thread_.wake_up();
   }
 }