diff --git a/src/MatBlazor/Components/MatAutocomplete/BaseMatAutocomplete.cs b/src/MatBlazor/Components/MatAutocomplete/BaseMatAutocomplete.cs
index 58f5618f..3d8274b8 100644
--- a/src/MatBlazor/Components/MatAutocomplete/BaseMatAutocomplete.cs
+++ b/src/MatBlazor/Components/MatAutocomplete/BaseMatAutocomplete.cs
@@ -81,6 +81,18 @@ public string StringValue
             }
         }
 
+        /// <summary>
+        /// This value is only returned for use in ValueExpression (required to make MatAutocomplete work inside EditForms).
+        /// </summary>
+        protected string DummyValue
+        {
+            get
+            {
+                return " ";
+            }
+            set { }
+        }
+
         /// <summary>
         /// The value to be used to pre-select an item from the list
         /// </summary>
diff --git a/src/MatBlazor/Components/MatAutocomplete/MatAutocomplete.razor b/src/MatBlazor/Components/MatAutocomplete/MatAutocomplete.razor
index 8a0f254b..e24d3d02 100644
--- a/src/MatBlazor/Components/MatAutocomplete/MatAutocomplete.razor
+++ b/src/MatBlazor/Components/MatAutocomplete/MatAutocomplete.razor
@@ -5,7 +5,6 @@
 
 
 <div class="@WrapperClassMapper.Class">
-    <MatTextField Icon="@Icon" OnFocus="@OpenPopup" HideClearButton="true" FullWidth="@FullWidth" OnFocusOut="@ClosePopup" Label="@Label" Value=@StringValue OnInput=@OnValueChanged OnKeyDown="@OnKeyDown" Outlined="@Outlined" Attributes="@Attributes" Id="@Id"></MatTextField>
     @if (IsShowingClearButton)
     {
         <div class="mat-autocomplete-clearbutton">
@@ -32,4 +31,5 @@
             </MatList>
         </div>
     }
+    <MatTextField Icon="@Icon" OnFocus="@OpenPopup" HideClearButton="true" FullWidth="@FullWidth" OnFocusOut="@ClosePopup" Label="@Label" Value="@StringValue" OnInput=@OnValueChanged OnKeyDown="@OnKeyDown" Outlined="@Outlined" Attributes="@Attributes" Id="@Id" ValueExpression="@(() => DummyValue)"></MatTextField>
 </div>
\ No newline at end of file