diff --git a/ChangeLog b/ChangeLog
index 18c51edb..a0e04465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
 *07/11/22:
+   * Fix division by 0 error when resize increments are set to 0 by an
+     application, bug #1836182
+     WinClient.cc
    * Added conditional statements to key commands (Mark)
      - for example, this will search for an open xterm window, cycle through
        them if there are any, or else open one:
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 83637e27..fb9fec6d 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -508,6 +508,11 @@ void WinClient::updateWMNormalHints() {
         } else
             width_inc = height_inc = 1;
 
+        if (width_inc == 0)
+            width_inc = 1;
+        if (height_inc == 0)
+            height_inc = 1;
+
         if (sizehint.flags & PAspect) {
             min_aspect_x = sizehint.min_aspect.x;
             min_aspect_y = sizehint.min_aspect.y;