diff --git a/src/controllers/list.js b/src/controllers/list.js
index 416ff0e9a1..b2be0bbd00 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -165,7 +165,14 @@ import { appRouter } from '../components/appRouter';
         instance.setFilterStatus(hasFilters);
 
         if (instance.alphaPicker) {
-            query.NameStartsWith = instance.alphaPicker.value();
+            const newValue = instance.alphaPicker.value();
+            if (newValue === '#') {
+                query.NameLessThan = 'A';
+                delete query.NameStartsWith;
+            } else {
+                query.NameStartsWith = newValue;
+                delete query.NameLessThan;
+            }
         }
 
         return query;