diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index f5c0584047e..41ac4b42f16 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -7,10 +7,6 @@
 
 package com.facebook.react.views.textinput;
 
-import static com.facebook.react.uimanager.UIManagerHelper.PADDING_BOTTOM_INDEX;
-import static com.facebook.react.uimanager.UIManagerHelper.PADDING_END_INDEX;
-import static com.facebook.react.uimanager.UIManagerHelper.PADDING_START_INDEX;
-import static com.facebook.react.uimanager.UIManagerHelper.PADDING_TOP_INDEX;
 import static com.facebook.react.uimanager.UIManagerHelper.getReactContext;
 
 import android.content.Context;
@@ -1241,38 +1237,6 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
       ReactEditText view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
     ReadableNativeMap state = stateWrapper.getState();
 
-    // Do we need to communicate theme back to C++?
-    // If so, this should only need to be done once per surface.
-    if (!state.getBoolean("hasThemeData")) {
-      WritableNativeMap update = new WritableNativeMap();
-
-      ReactContext reactContext = UIManagerHelper.getReactContext(view);
-      if (reactContext instanceof ThemedReactContext) {
-        ThemedReactContext themedReactContext = (ThemedReactContext) reactContext;
-
-        // Even though we check `data["textChanged"].empty()` before using the value in C++,
-        // state updates crash without this value on key exception. It's unintuitive why
-        // folly::dynamic is crashing there and if there's any way to fix on the native side,
-        // so leave this here until we can figure out a better way of key-existence-checking in C++.
-        update.putNull("textChanged");
-
-        // TODO T68526882 review is themePadding can be removed from TextInput
-        float[] padding = UIManagerHelper.getDefaultTextInputPadding(themedReactContext);
-        update.putDouble("themePaddingStart", padding[PADDING_START_INDEX]);
-        update.putDouble("themePaddingEnd", padding[PADDING_END_INDEX]);
-        update.putDouble("themePaddingTop", padding[PADDING_TOP_INDEX]);
-        update.putDouble("themePaddingBottom", padding[PADDING_BOTTOM_INDEX]);
-
-        stateWrapper.updateState(update);
-      } else {
-        ReactSoftException.logSoftException(
-            TAG,
-            new IllegalStateException(
-                "ReactContext is not a ThemedReactContent: "
-                    + (reactContext != null ? reactContext.getClass().getName() : "null")));
-      }
-    }
-
     ReadableMap attributedString = state.getMap("attributedString");
     ReadableMap paragraphAttributes = state.getMap("paragraphAttributes");
 
diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
index 928c9b7f039..1644fc6b625 100644
--- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -37,18 +37,11 @@ class AndroidTextInputComponentDescriptor final
       ShadowNodeFamily::Shared const &family) const override {
     int surfaceId = family->getSurfaceId();
 
-    float defaultThemePaddingStart = NAN;
-    float defaultThemePaddingEnd = NAN;
-    float defaultThemePaddingTop = NAN;
-    float defaultThemePaddingBottom = NAN;
-
+    YGStyle::Edges theme;
+    // TODO: figure out RTL/start/end/left/right stuff here
     if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
         surfaceIdToThemePaddingMap_.end()) {
-      YGStyle::Edges theme = surfaceIdToThemePaddingMap_[surfaceId];
-      defaultThemePaddingStart = ((YGValue)theme[YGEdgeStart]).value;
-      defaultThemePaddingEnd = ((YGValue)theme[YGEdgeEnd]).value;
-      defaultThemePaddingTop = ((YGValue)theme[YGEdgeTop]).value;
-      defaultThemePaddingBottom = ((YGValue)theme[YGEdgeBottom]).value;
+      theme = surfaceIdToThemePaddingMap_[surfaceId];
     } else {
       const jni::global_ref<jobject> &fabricUIManager =
           contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
@@ -63,10 +56,12 @@ class AndroidTextInputComponentDescriptor final
               fabricUIManager, surfaceId, defaultTextInputPaddingArray)) {
         jfloat *defaultTextInputPadding =
             env->GetFloatArrayElements(defaultTextInputPaddingArray, 0);
-        defaultThemePaddingStart = defaultTextInputPadding[0];
-        defaultThemePaddingEnd = defaultTextInputPadding[1];
-        defaultThemePaddingTop = defaultTextInputPadding[2];
-        defaultThemePaddingBottom = defaultTextInputPadding[3];
+        theme[YGEdgeStart] = (YGValue){defaultTextInputPadding[0], YGUnitPoint};
+        theme[YGEdgeEnd] = (YGValue){defaultTextInputPadding[1], YGUnitPoint};
+        theme[YGEdgeTop] = (YGValue){defaultTextInputPadding[2], YGUnitPoint};
+        theme[YGEdgeBottom] =
+            (YGValue){defaultTextInputPadding[3], YGUnitPoint};
+        surfaceIdToThemePaddingMap_.emplace(std::make_pair(surfaceId, theme));
       }
       env->DeleteLocalRef(defaultTextInputPaddingArray);
     }
@@ -80,10 +75,10 @@ class AndroidTextInputComponentDescriptor final
             {},
             {},
             textLayoutManager_,
-            defaultThemePaddingStart,
-            defaultThemePaddingEnd,
-            defaultThemePaddingTop,
-            defaultThemePaddingBottom)),
+            ((YGValue)theme[YGEdgeStart]).value,
+            ((YGValue)theme[YGEdgeEnd]).value,
+            ((YGValue)theme[YGEdgeTop]).value,
+            ((YGValue)theme[YGEdgeBottom]).value)),
         family);
   }
 
@@ -100,27 +95,7 @@ class AndroidTextInputComponentDescriptor final
     textInputShadowNode->setContextContainer(
         const_cast<ContextContainer *>(getContextContainer().get()));
 
-    // Get theme padding from cache, or set it from State.
-    // In theory, the Java ViewManager for TextInput should need to set state
-    // *exactly once* per surface to communicate the correct default padding,
-    // which will be cached here in C++.
-    // TODO T63008435: can this feature be removed entirely?
-    // TODO: figure out RTL/start/end/left/right stuff here
     int surfaceId = textInputShadowNode->getSurfaceId();
-    const AndroidTextInputState &state = textInputShadowNode->getStateData();
-    if (surfaceIdToThemePaddingMap_.find(surfaceId) ==
-            surfaceIdToThemePaddingMap_.end() &&
-        !isnan(state.defaultThemePaddingStart)) {
-      YGStyle::Edges result;
-      result[YGEdgeStart] =
-          (YGValue){state.defaultThemePaddingStart, YGUnitPoint};
-      result[YGEdgeEnd] = (YGValue){state.defaultThemePaddingEnd, YGUnitPoint};
-      result[YGEdgeTop] = (YGValue){state.defaultThemePaddingTop, YGUnitPoint};
-      result[YGEdgeBottom] =
-          (YGValue){state.defaultThemePaddingBottom, YGUnitPoint};
-      surfaceIdToThemePaddingMap_.emplace(std::make_pair(surfaceId, result));
-    }
-
     if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
         surfaceIdToThemePaddingMap_.end()) {
       YGStyle::Edges theme = surfaceIdToThemePaddingMap_[surfaceId];
diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp
index 0128c17f00e..4e37be0aa6f 100644
--- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp
@@ -21,7 +21,6 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   newState["attributedString"] = toDynamic(attributedString);
   newState["paragraphAttributes"] = toDynamic(paragraphAttributes);
   newState["hash"] = newState["attributedString"]["hash"];
-  newState["hasThemeData"] = !isnan(defaultThemePaddingStart);
   return newState;
 }
 #endif