diff --git a/include/util/command.hpp b/include/util/command.hpp
index 58c59a96..89d4372a 100644
--- a/include/util/command.hpp
+++ b/include/util/command.hpp
@@ -172,8 +172,6 @@ inline int32_t forkExec(const std::string& cmd, const std::string& output_name)
   return pid;
 }
 
-inline int32_t forkExec(const std::string& cmd) {
-  return forkExec(cmd, "");
-}
+inline int32_t forkExec(const std::string& cmd) { return forkExec(cmd, ""); }
 
 }  // namespace waybar::util::command
diff --git a/man/waybar-image.5.scd b/man/waybar-image.5.scd
index 8c991265..8be182a6 100644
--- a/man/waybar-image.5.scd
+++ b/man/waybar-image.5.scd
@@ -26,7 +26,8 @@ The *image* module displays an image from a path.
 *interval*: ++
 	typeof: integer or float ++
 	The interval (in seconds) to re-render the image. ++
-	Minimum value is 0.001 (1ms). Values smaller than 1ms will be set to 1ms. ++
+	If set to a positive value, the minimum is 0.001 (1ms). Values smaller than 1ms will be set to 1ms. ++
+	Zero or negative values are treated as "once". ++
 	This is useful if the contents of *path* changes. ++
 	If no *interval* is defined, the image will only be rendered once.
 
diff --git a/src/modules/hyprland/window.cpp b/src/modules/hyprland/window.cpp
index e02a7691..197ed092 100644
--- a/src/modules/hyprland/window.cpp
+++ b/src/modules/hyprland/window.cpp
@@ -237,9 +237,7 @@ void Window::queryActiveWorkspace() {
   }
 }
 
-void Window::onEvent(const std::string& ev) {
-  dp.emit();
-}
+void Window::onEvent(const std::string& ev) { dp.emit(); }
 
 void Window::setClass(const std::string& classname, bool enable) {
   if (enable) {
diff --git a/src/modules/hyprland/windowcount.cpp b/src/modules/hyprland/windowcount.cpp
index 487b0083..d881a361 100644
--- a/src/modules/hyprland/windowcount.cpp
+++ b/src/modules/hyprland/windowcount.cpp
@@ -38,7 +38,7 @@ WindowCount::~WindowCount() {
 
 auto WindowCount::update() -> void {
   std::lock_guard<std::mutex> lg(mutex_);
-  
+
   queryActiveWorkspace();
 
   std::string format = config_["format"].asString();
@@ -125,9 +125,7 @@ void WindowCount::queryActiveWorkspace() {
   }
 }
 
-void WindowCount::onEvent(const std::string& ev) {
-  dp.emit();
-}
+void WindowCount::onEvent(const std::string& ev) { dp.emit(); }
 
 void WindowCount::setClass(const std::string& classname, bool enable) {
   if (enable) {
diff --git a/src/modules/image.cpp b/src/modules/image.cpp
index 189deee6..98bf3c46 100644
--- a/src/modules/image.cpp
+++ b/src/modules/image.cpp
@@ -14,22 +14,27 @@ waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
 
   size_ = config["size"].asInt();
 
-  interval_ = config_["interval"] == "once"
-                  ? std::chrono::milliseconds::max()
-                  : std::chrono::milliseconds(std::max(
-                        1L,  // Minimum 1ms due to millisecond precision
-                        static_cast<long>(
-                            (config_["interval"].isNumeric() ? config_["interval"].asDouble() : 0) *
-                            1000)));
+  const auto once = std::chrono::milliseconds::max();
+  if (!config_.isMember("interval") || config_["interval"].isNull() ||
+      config_["interval"] == "once") {
+    interval_ = once;
+  } else if (config_["interval"].isNumeric()) {
+    const auto interval_seconds = config_["interval"].asDouble();
+    if (interval_seconds <= 0) {
+      interval_ = once;
+    } else {
+      interval_ =
+          std::chrono::milliseconds(std::max(1L,  // Minimum 1ms due to millisecond precision
+                                             static_cast<long>(interval_seconds * 1000)));
+    }
+  } else {
+    interval_ = once;
+  }
 
   if (size_ == 0) {
     size_ = 16;
   }
 
-  if (interval_.count() == 0) {
-    interval_ = std::chrono::milliseconds::max();
-  }
-
   delayWorker();
 }