diff --git a/Radzen.Blazor/RadzenFormField.razor b/Radzen.Blazor/RadzenFormField.razor
index 55b90601f..361270e7a 100644
--- a/Radzen.Blazor/RadzenFormField.razor
+++ b/Radzen.Blazor/RadzenFormField.razor
@@ -3,7 +3,7 @@
 
 @if (Visible)
 {
-<div @ref="@Element" for="@Component" style="@Style" @attributes="Attributes" class="@GetCssClass()" id="@GetId()">
+<div @ref="@Element" style="@Style" @attributes="Attributes" class="@GetCssClass()" id="@GetId()">
     <div class="rz-form-field-content">
         <CascadingValue Value=@context>
         @if (Start != null)
@@ -13,7 +13,7 @@
         </div>
         }
         @ChildContent
-        <label class="rz-form-field-label rz-text-truncate" for=@Component>  @if (TextTemplate is null) {@Text} else {@TextTemplate} </label>
+        <label class="rz-form-field-label rz-text-truncate" for="@(string.IsNullOrEmpty(Component) ? null : Component)">  @if (TextTemplate is null) {@Text} else {@TextTemplate} </label>
         @if (End != null)
         {
         <div class="rz-form-field-end">
diff --git a/RadzenBlazorDemos/Pages/FormFieldTextBox.razor b/RadzenBlazorDemos/Pages/FormFieldTextBox.razor
index c70e4d699..f31ac2e14 100644
--- a/RadzenBlazorDemos/Pages/FormFieldTextBox.razor
+++ b/RadzenBlazorDemos/Pages/FormFieldTextBox.razor
@@ -1,22 +1,22 @@
 <RadzenRow AlignItems="AlignItems.End" Wrap="FlexWrap.Wrap" Gap="1rem" class="rz-p-sm-12">
     <RadzenColumn Size="12" SizeMD="6" SizeLG="3">
-        <RadzenFormField Text="Outlined/Default" Style="width: 100%;">
-            <RadzenTextBox @bind-Value="@value" />
+        <RadzenFormField Text="Outlined/Default" Component="FormFieldTextBoxOutlined" Style="width: 100%;">
+            <RadzenTextBox id="FormFieldTextBoxOutlined" @bind-Value="@value" />
         </RadzenFormField>
     </RadzenColumn>
     <RadzenColumn Size="12" SizeMD="6" SizeLG="3">
-        <RadzenFormField Text="Text" Variant="Variant.Text" Style="width: 100%;">
-            <RadzenTextBox @bind-Value="@value" />
+        <RadzenFormField Text="Text" Variant="Variant.Text" Component="FormFieldTextBoxText" Style="width: 100%;">
+            <RadzenTextBox id="FormFieldTextBoxText" @bind-Value="@value" />
         </RadzenFormField>
     </RadzenColumn>
     <RadzenColumn Size="12" SizeMD="6" SizeLG="3">
-        <RadzenFormField Text="Flat" Variant="Variant.Flat" Style="width: 100%;">
-            <RadzenTextBox @bind-Value="@value" />
+        <RadzenFormField Text="Flat" Variant="Variant.Flat" Component="FormFieldTextBoxFlat" Style="width: 100%;">
+            <RadzenTextBox id="FormFieldTextBoxFlat" @bind-Value="@value" />
         </RadzenFormField>
     </RadzenColumn>
     <RadzenColumn Size="12" SizeMD="6" SizeLG="3">
-        <RadzenFormField Text="Filled" Variant="Variant.Filled" Style="width: 100%;">
-            <RadzenTextBox @bind-Value="@value" />
+        <RadzenFormField Text="Filled" Variant="Variant.Filled" Component="FormFieldTextBoxFilled" Style="width: 100%;">
+            <RadzenTextBox id="FormFieldTextBoxFilled" @bind-Value="@value" />
         </RadzenFormField>
     </RadzenColumn>
 </RadzenRow>