diff --git a/src/main/java/com/zebrunner/carina/webdriver/decorator/ExtendedWebElement.java b/src/main/java/com/zebrunner/carina/webdriver/decorator/ExtendedWebElement.java
index d310ebd..a4334e0 100644
--- a/src/main/java/com/zebrunner/carina/webdriver/decorator/ExtendedWebElement.java
+++ b/src/main/java/com/zebrunner/carina/webdriver/decorator/ExtendedWebElement.java
@@ -1722,23 +1722,7 @@ protected ExpectedCondition<?> getDefaultElementWaitCondition() {
         List<ExpectedCondition<?>> conditions = new ArrayList<>();
         if (loadingStrategy == ElementLoadingStrategy.BY_PRESENCE || loadingStrategy == ElementLoadingStrategy.BY_PRESENCE_OR_VISIBILITY) {
             if (element != null) {
-                conditions.add(
-                        new ExpectedCondition<Boolean>() {
-                            @Override
-                            public Boolean apply(WebDriver ignored) {
-                                try {
-                                    // Calling any method forces a staleness check
-                                    return element.isDisplayed();
-                                } catch (StaleElementReferenceException expected) {
-                                    return false;
-                                }
-                            }
-
-                            @Override
-                            public String toString() {
-                                return String.format("element (%s) to become stale", element);
-                            }
-                        });
+                conditions.add(ExpectedConditions.not(ExpectedConditions.stalenessOf(element)));
             }
             if (by != null) {
                 conditions.add(getSearchContext() instanceof WebElement