diff --git a/client/android/build.gradle b/client/android/build.gradle
index de6e72885..d0e92623e 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -8,9 +8,9 @@ def publicationType = PublicationType.fromString(project.findProperty("publicati
 
 ext {
     minSdkVersion = 21
-    compileSdkVersion = 33
+    compileSdkVersion = 34
     targetSdkVersion = 31
-    buildToolsVersion = "33.0.0"
+    buildToolsVersion = "34.0.0"
 
     divkitVersionName = "${divkitVersion.versionName}${publicationType.getVersionSuffix()}"
 }
diff --git a/client/android/div/src/main/java/com/yandex/div/core/view2/Div2View.kt b/client/android/div/src/main/java/com/yandex/div/core/view2/Div2View.kt
index 5bd753b84..b4c1f514e 100644
--- a/client/android/div/src/main/java/com/yandex/div/core/view2/Div2View.kt
+++ b/client/android/div/src/main/java/com/yandex/div/core/view2/Div2View.kt
@@ -382,7 +382,7 @@ class Div2View private constructor(
         histogramReporter.onMeasureFinished()
     }
 
-    override fun draw(canvas: Canvas?) {
+    override fun draw(canvas: Canvas) {
         drawWasSkipped = false
         histogramReporter.onDrawStarted()
         super.draw(canvas)
diff --git a/client/android/div/src/main/java/com/yandex/div/core/view2/divs/widgets/DivStateLayout.kt b/client/android/div/src/main/java/com/yandex/div/core/view2/divs/widgets/DivStateLayout.kt
index d60e9072f..e948a615c 100644
--- a/client/android/div/src/main/java/com/yandex/div/core/view2/divs/widgets/DivStateLayout.kt
+++ b/client/android/div/src/main/java/com/yandex/div/core/view2/divs/widgets/DivStateLayout.kt
@@ -145,8 +145,9 @@ internal class DivStateLayout @JvmOverloads constructor(
             return true
         }
 
-        override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+        override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
             val view = this.view ?: return false
+            if (e1 == null) return false
             val scrollDirection = sign(distanceX).toInt()
             if (view.translationX == 0f &&
                 abs(distanceX) > 2 * abs(distanceY) &&