1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/declarative/Design.java b/server/src/main/java/com/vaadin/ui/declarative/Design.java
index b7be276ec0..789f6c8a7b 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/Design.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/Design.java
@@ -495,8 +495,8 @@ public class Design implements Serializable {
             designContext.addComponentCreationListener(creationListener);
 
             // create subtree
-            if (componentRoot instanceof CustomComponent
-                    || componentRoot instanceof Composite) {
+
+            if (ComponentRootSetter.canSetRoot(componentRoot)) {
                 Component rootComponent = designContext.readDesign(element);
                 ComponentRootSetter.setRoot(componentRoot, rootComponent);
             } else {