diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle
index 9d5a0fd2edd..50d7b54874d 100644
--- a/lib/android/app/build.gradle
+++ b/lib/android/app/build.gradle
@@ -62,11 +62,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     flavorDimensions "RNN.reactNativeVersion"
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt
index 93b3b8e5690..739a2f18178 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt
@@ -193,11 +193,10 @@ open class ButtonPresenter(private val context: Context, private val button: But
                 it.tag = button.testId.get()
 
                 class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){
-                    override fun onInitializeAccessibilityNodeInfo(
-                        host: View?,
-                        info: AccessibilityNodeInfoCompat?
-                    ) {
-                        super.onInitializeAccessibilityNodeInfo(host, info)
+                    override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+                        if (host != null) {
+                            super.onInitializeAccessibilityNodeInfo(host, info)
+                        }
 
                         // Expose the testID prop as the resource-id name of the view. Black-box E2E/UI testing
                         // frameworks, which interact with the UI through the accessibility framework, do not have