1 files changed, 4 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java
index 541d369c55..9a4da009e9 100644
--- a/server/src/com/vaadin/ui/CssLayout.java
+++ b/server/src/com/vaadin/ui/CssLayout.java
@@ -388,7 +388,11 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     public void writeDesign(Element design, DesignContext designContext) {
         // synchronize default attributes
         super.writeDesign(design, designContext);
+        CssLayout def = designContext.getDefaultInstance(this);
         // handle children
+        if (!designContext.shouldWriteChildren(this, def)) {
+            return;
+        }
         Element designElement = design;
         for (Component child : this) {
             Element childNode = designContext.createElement(child);