diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
index a689ce04e5e..5084441a171 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
@@ -203,9 +203,9 @@ protected Drawable generateSelectedDrawable(KrollDict properties, Drawable drawa
 			stateDrawable.addState(new int[] { android.R.attr.state_activated }, new ColorDrawable(COLOR_SELECTED));
 		}
 
-		// NOTE: Android 6.0 and below require ShapeDrawable to have non-null Shape.
-		// This bug is fixed on Android 7.0 and above.
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+		// NOTE: Android 7.1 and below require ShapeDrawable to have non-null Shape.
+		// This bug is fixed on Android 8.0 and above.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
 			Drawable currentDrawable = drawable;
 
 			if (currentDrawable instanceof RippleDrawable) {