diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
index a70e1e0cfc..4f2088fdf7 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
@@ -90,6 +90,10 @@ class InputConnectionAdaptor extends BaseInputConnection {
 
     @Override
     public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (Selection.getSelectionStart(mEditable) == -1 ||
+            Selection.getSelectionStart(mEditable) == -1)
+            return true;
+
         boolean result = super.deleteSurroundingText(beforeLength, afterLength);
         updateEditingState();
         return result;