diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py
index 2c3dc74..3e44e66 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_members.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_members.py
@@ -227,3 +227,11 @@
         self.assertEqual(len(response.context['members']), 1)
         self.assertContains(response, member_1.email)
         self.assertNotContains(response, member_2.email)
+        response = self.client.get(reverse(
+            'list_members', args=['foo@example.com', 'subscriber']),
+            {'q': 'not_a_member'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.context['members']), 0)
+        self.assertNotContains(response, member_2.email)
+        self.assertNotContains(response, member_2.email)
+
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 5146215..4b89ac1 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -105,7 +105,10 @@
         context['members'] = utils.paginate(
             request, method, count=request.GET.get('count', 25),
             paginator_class=utils.MailmanPaginator)
-        context['empty_error'] = _('List has no Subscribers')
+        if len(mailing_list.members) == 0:
+            context['empty_error'] = _('List has no Subscribers')
+        else:
+            context['empty_error'] = _('No member was found matching the search')
         context['count_options'] = [25, 50, 100, 200]
         context['form'] = form
     else: