diff --git a/samples/BlazorClientSide/Pages/Index.razor b/samples/BlazorClientSide/Pages/Index.razor
index 5a4f55c..fbb8a54 100644
--- a/samples/BlazorClientSide/Pages/Index.razor
+++ b/samples/BlazorClientSide/Pages/Index.razor
@@ -73,6 +73,24 @@
 
 <hr />
 
+<h1>Blazored Typeahead - Disabled (Null Value)</h1>
+
+<BlazoredTypeahead SearchMethod="@GetPeopleLocal"
+                   @bind-Value="@SelectedPersonNull"
+                   Disabled="IsDisabled"
+                   placeholder="Search by first name...">
+    <SelectedTemplate Context="person">
+        @person.Firstname
+    </SelectedTemplate>
+    <ResultTemplate Context="person">
+        @person.Firstname @person.Lastname
+    </ResultTemplate>
+</BlazoredTypeahead>
+
+<button class="btn btn-primary" style="margin-top: 20px;" @onclick="@(() => IsDisabled = !IsDisabled)">@(IsDisabled ? "Enable" : "Disable")</button>
+
+<hr />
+
 <h1>Blazored Typeahead - Binding to different type</h1>
 
 <BlazoredTypeahead SearchMethod="GetPeopleLocal"
@@ -164,6 +182,7 @@
     private List<Person> People = new List<Person>();
 
     private Person SelectedPerson;
+    private Person SelectedPersonNull;
     private int? SelectedPersonId;
     private IList<Person> SelectedPeople;
     private FormExample FormModel = new FormExample();
diff --git a/samples/BlazorServerSide/Pages/Index.razor b/samples/BlazorServerSide/Pages/Index.razor
index 396b7d6..5bd3bbc 100644
--- a/samples/BlazorServerSide/Pages/Index.razor
+++ b/samples/BlazorServerSide/Pages/Index.razor
@@ -73,6 +73,24 @@
 
 <hr />
 
+<h1>Blazored Typeahead - Disabled (Null Value)</h1>
+
+<BlazoredTypeahead SearchMethod="@GetPeopleLocal"
+                   @bind-Value="@SelectedPersonNull"
+                   Disabled="IsDisabled"
+                   placeholder="Search by first name...">
+    <SelectedTemplate Context="person">
+        @person.Firstname
+    </SelectedTemplate>
+    <ResultTemplate Context="person">
+        @person.Firstname @person.Lastname
+    </ResultTemplate>
+</BlazoredTypeahead>
+
+<button class="btn btn-primary" style="margin-top: 20px;" @onclick="@(() => IsDisabled = !IsDisabled)">@(IsDisabled ? "Enable" : "Disable")</button>
+
+<hr />
+
 <h1>Blazored Typeahead - Binding to different type</h1>
 
 <BlazoredTypeahead SearchMethod="GetPeopleLocal"
@@ -135,6 +153,7 @@
     private List<Person> People = new List<Person>();
 
     private Person SelectedPerson;
+    private Person SelectedPersonNull;
     private int? SelectedPersonId;
     private IList<Person> SelectedPeople;
     private FormExample FormModel = new FormExample();
diff --git a/src/Blazored.Typeahead/BlazoredTypeahead.razor b/src/Blazored.Typeahead/BlazoredTypeahead.razor
index be4391f..e6e703a 100644
--- a/src/Blazored.Typeahead/BlazoredTypeahead.razor
+++ b/src/Blazored.Typeahead/BlazoredTypeahead.razor
@@ -27,9 +27,12 @@
                 }
                 else
                 {
-                    <div class="blazored-typeahead__input-mask" tabindex="0">
-                        @SelectedTemplate(Value)
-                    </div>
+                    if (Value != null)
+                    {
+                        <div class="blazored-typeahead__input-mask" tabindex="0">
+                            @SelectedTemplate(Value)
+                        </div>
+                    }
                 }
             </div>
             <div class="blazored-typeahead__input-icon blazored-typeahead__input-icon--disabled">