diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 761a3f3b3d..a50175bdee 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -1082,7 +1082,11 @@ namespace Avalonia.Controls.Primitives
             }
             else
             {
-                if (ItemCount > 0)
+                if (ItemCount == 0 && SelectedIndex != -1)
+                {
+                    SelectedIndex = -1;
+                }
+                else
                 {
                     SelectedIndex = _updateSelectedIndex != int.MinValue ? _updateSelectedIndex : 0;
                 }