diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index fb68a4cc3b5..91757840ec5 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -161,7 +161,7 @@ XPATH
         .//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
         //div[@class='list-group' and not(contains(@class, 'hidden'))]//*[text()[contains(., %locator%)]] |
         .//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
-        //div[@data-region='empty-message-container' and not(contains(@class, 'hidden'))]//*[text()[contains(., %locator%)]]
+        //div[@data-region='empty-message-container' and not(contains(@class, 'hidden')) and contains(., %locator%)]
 XPATH
     , 'group_message_tab' => <<<XPATH
         .//*[@data-region='message-drawer']//button[@data-toggle='collapse']//*[text()[contains(., %locator%)]]/..