diff --git a/.changeset/red-jobs-exist.md b/.changeset/red-jobs-exist.md
new file mode 100644
index 000000000..35bddd782
--- /dev/null
+++ b/.changeset/red-jobs-exist.md
@@ -0,0 +1,5 @@
+---
+"@cube-dev/ui-kit": patch
+---
+
+Fix qa prop on TextInputBase.
diff --git a/src/components/fields/TextInput/TextInputBase.tsx b/src/components/fields/TextInput/TextInputBase.tsx
index c254599f3..62948e736 100644
--- a/src/components/fields/TextInput/TextInputBase.tsx
+++ b/src/components/fields/TextInput/TextInputBase.tsx
@@ -128,7 +128,10 @@ export const INPUT_WRAPPER_STYLES: Styles = {
   },
 };
 
-const InputWrapperElement = tasty({ styles: INPUT_WRAPPER_STYLES });
+const InputWrapperElement = tasty({
+  qa: 'InputWrapper',
+  styles: INPUT_WRAPPER_STYLES,
+});
 
 const STYLE_LIST = [...POSITION_STYLES, ...DIMENSION_STYLES];
 
@@ -357,7 +360,6 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
   const textField = (
     <InputWrapperElement
       ref={wrapperRef}
-      qa={qa || 'TextInput'}
       mods={modifiers}
       data-size={size}
       styles={wrapperStyles}
@@ -365,6 +367,7 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
     >
       {prefix ? <div data-element="Prefix">{prefix}</div> : null}
       <InputElement
+        qa={qa || 'Input'}
         as={ElementType}
         {...mergeProps(inputProps, focusProps, hoverProps)}
         ref={inputRef}
@@ -397,6 +400,7 @@ function _TextInputBase(props: CubeTextInputBaseProps, ref) {
 
   return wrapWithField(textField, domRef, {
     ...props,
+    form: undefined,
     styles,
   });
 }