diff --git a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt
index 0a651ec50c..8dede30a3b 100644
--- a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt
+++ b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt
@@ -3,6 +3,7 @@ package com.reactnativekeyboardcontroller.extensions
 import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Point
 import android.os.Build
 import android.provider.Settings
@@ -40,12 +41,7 @@ fun Context.getDisplaySize(): Point {
 }
 
 fun Context.isSystemDarkMode(): Boolean =
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-    (getSystemService(Context.UI_MODE_SERVICE) as? android.app.UiModeManager)
-      ?.nightMode == android.app.UiModeManager.MODE_NIGHT_YES
-  } else {
-    false
-  }
+  resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 
 fun Context.currentImePackage(): String? {
   val id =
diff --git a/src/components/KeyboardToolbar/Button.tsx b/src/components/KeyboardToolbar/Button.tsx
index d0a90d906d..a4ca60e596 100644
--- a/src/components/KeyboardToolbar/Button.tsx
+++ b/src/components/KeyboardToolbar/Button.tsx
@@ -65,6 +65,7 @@ const ButtonAndroid = ({
   theme,
 }: PropsWithChildren<ButtonProps>) => {
   const colorScheme = useKeyboardState((state) => state.appearance);
+
   const accessibilityState = useMemo(() => ({ disabled }), [disabled]);
   const ripple = useMemo(
     () =>