diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index a107ee38..8ee90c69 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -48,6 +48,7 @@ Public Class RepositoryItemLookupControl3
     Public Sub New()
         SetDropdownButtonEnabled(_MultiSelect)
 
+        UpdateSelectedValues(New List(Of String))
     End Sub
 
     Private Const NAME_DATATABLE_INTERNAL = "__INTERNAL_DATATABLE__"
@@ -159,14 +160,19 @@ Public Class RepositoryItemLookupControl3
         If MultiSelect = True Then
             Select Case Values.Count
                 Case 0
-                    NullText = String.Empty
+                    NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
                 Case 1
                     NullText = Values.FirstOrDefault()
                 Case Else
                     NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count)
             End Select
         Else
-            NullText = Values.FirstOrDefault()
+            Select Case Values.Count
+                Case 0
+                    NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
+                Case Else
+                    NullText = Values.FirstOrDefault()
+            End Select
         End If
 
         ' If No external Datasource is supplied, create one containing the currently selected values
@@ -191,6 +197,10 @@ Public Class RepositoryItemLookupControl3
         RaiseEvent SelectedValuesChanged(Me, Values)
     End Sub
 
+    Protected Overrides Function ShouldSerializeNullText() As Boolean
+        Return False
+    End Function
+
     Public Overrides Sub CreateDefaultButton()
         Dim oButtons As New List(Of EditorButton) From {
             New EditorButton() With {