diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/WebElementFacadeImpl.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/WebElementFacadeImpl.java
index 12b8ebf8f3..ba3c87cf22 100644
--- a/serenity-core/src/main/java/net/serenitybdd/core/pages/WebElementFacadeImpl.java
+++ b/serenity-core/src/main/java/net/serenitybdd/core/pages/WebElementFacadeImpl.java
@@ -1094,12 +1094,8 @@ private void throwShouldBePresentErrorWithCauseIfPresent(final Throwable timeout
         throw new ElementShouldBePresentException(finalMessage, timeout);
     }
 
-    private static final List<String> HTML_ELEMENTS_WITH_VALUE_ATTRIBUTE = Arrays.asList("input", "button", "option", "textarea");
-
     private boolean hasValueAttribute(WebElement element) {
-        String tag = element.getTagName().toLowerCase();
-        return HTML_ELEMENTS_WITH_VALUE_ATTRIBUTE.contains(tag);
-
+        return element.getAttribute("value") != null;
     }
 
     @Override