diff --git a/flow-html-components/src/main/java/com/vaadin/flow/component/html/Image.java b/flow-html-components/src/main/java/com/vaadin/flow/component/html/Image.java
index 2ff24cc022c..efe3c57dbef 100644
--- a/flow-html-components/src/main/java/com/vaadin/flow/component/html/Image.java
+++ b/flow-html-components/src/main/java/com/vaadin/flow/component/html/Image.java
@@ -21,7 +21,7 @@
 
 import com.vaadin.flow.component.ClickNotifier;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HtmlContainer;
+import com.vaadin.flow.component.HtmlComponent;
 import com.vaadin.flow.component.PropertyDescriptor;
 import com.vaadin.flow.component.PropertyDescriptors;
 import com.vaadin.flow.component.Tag;
@@ -38,7 +38,7 @@
  * @since 1.0
  */
 @Tag(Tag.IMG)
-public class Image extends HtmlContainer
+public class Image extends HtmlComponent
         implements ClickNotifier<Image>, HasAriaLabel {
 
     private static final String ALT_ATTRIBUTE = "alt";