diff --git a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
index 93a99dc1b2..2b34170afa 100644
--- a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
+++ b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
@@ -789,8 +789,9 @@ public boolean gridMessagePresent()
 
     public List<String> getGridMessages()
     {
-        return getWrapper().getTexts(Locator.tagWithClass("div", "grid-messages")
-                .child(Locator.tagWithClass("div", "grid-message")).findElements(this));
+        return getWrapper().shortWait().ignoring(StaleElementReferenceException.class)
+                .until(d -> getWrapper().getTexts(Locator.tagWithClass("div", "grid-messages")
+                        .child(Locator.tagWithClass("div", "grid-message")).findElements(this)));
     }
 
     public boolean hasGridError()