diff --git a/src/indev/lv_indev.c b/src/indev/lv_indev.c
index da97891719..c1e58e8340 100644
--- a/src/indev/lv_indev.c
+++ b/src/indev/lv_indev.c
@@ -1428,6 +1428,14 @@ static void indev_proc_release(lv_indev_t * indev)
                 parent = lv_obj_get_parent(parent);
             }
 
+            if(scale_x == 0) {
+                scale_x = 1;
+            }
+
+            if(scale_y == 0) {
+                scale_y = 1;
+            }
+
             if(angle != 0 || scale_y != LV_SCALE_NONE || scale_x != LV_SCALE_NONE) {
                 angle = -angle;
                 scale_x = (256 * 256) / scale_x;
diff --git a/src/indev/lv_indev_scroll.c b/src/indev/lv_indev_scroll.c
index 97cea36f3a..0c6553ffcd 100644
--- a/src/indev/lv_indev_scroll.c
+++ b/src/indev/lv_indev_scroll.c
@@ -76,6 +76,14 @@ void lv_indev_scroll_handler(lv_indev_t * indev)
         parent = lv_obj_get_parent(parent);
     }
 
+    if(scale_x == 0) {
+        scale_x = 1;
+    }
+
+    if(scale_y == 0) {
+        scale_y = 1;
+    }
+
     if(angle != 0 || scale_x != LV_SCALE_NONE || scale_y != LV_SCALE_NONE) {
         angle = -angle;
         scale_x = (256 * 256) / scale_x;
@@ -292,6 +300,14 @@ lv_obj_t * lv_indev_find_scroll_obj(lv_indev_t * indev)
             parent = lv_obj_get_parent(parent);
         }
 
+        if(scale_x == 0) {
+            scale_x = 1;
+        }
+
+        if(scale_y == 0) {
+            scale_y = 1;
+        }
+
         lv_point_t obj_scroll_sum = indev->pointer.scroll_sum;
         if(angle != 0 || scale_x != LV_SCALE_NONE || scale_y != LV_SCALE_NONE) {
             angle = -angle;