diff --git a/packages/core/ui/builder/component-builder/index.ts b/packages/core/ui/builder/component-builder/index.ts
index 14943cd36..dc0834d69 100644
--- a/packages/core/ui/builder/component-builder/index.ts
+++ b/packages/core/ui/builder/component-builder/index.ts
@@ -15,7 +15,7 @@ export interface ComponentModule {
 	exports: any;
 }
 
-const legacyShortBarrels = [
+const legacyShortBarrels = __UI_USE_EXTERNAL_RENDERER__?[]:[
 	'text/formatted-string',
 	'text/span',
 	'ui/text-base/formatted-string',
diff --git a/packages/core/ui/editable-text-base/index.android.ts b/packages/core/ui/editable-text-base/index.android.ts
index 5037835af..1f657ce7d 100644
--- a/packages/core/ui/editable-text-base/index.android.ts
+++ b/packages/core/ui/editable-text-base/index.android.ts
@@ -143,8 +143,6 @@ function initializeEditTextListeners(): void {
 	EditTextListeners = EditTextListenersImpl;
 }
 
-let apiLevel: number;
-
 export abstract class EditableTextBase extends EditableTextBaseCommon {
 	/* tslint:disable */
 	_dirtyTextAccumulator: string;
@@ -164,9 +162,6 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 	}
 
 	public createNativeView() {
-		if (!apiLevel) {
-			apiLevel = sdkVersion();
-		}
 		return new android.widget.EditText(this._context);
 	}
 
@@ -308,7 +303,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 	}
 
 	[autofillTypeProperty.setNative](value: CoreTypes.AutofillType) {
-		if (apiLevel < 26) {
+		if (sdkVersion() < 26) {
 			return;
 		}
 		let newOptions;