1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/ui/CustomComponent.java b/src/com/itmill/toolkit/ui/CustomComponent.java
index 9a6fdc3391..dd4b1577c2 100644
--- a/src/com/itmill/toolkit/ui/CustomComponent.java
+++ b/src/com/itmill/toolkit/ui/CustomComponent.java
@@ -146,7 +146,7 @@ public class CustomComponent extends AbstractComponentContainer {
 
     public Iterator getComponentIterator() {
         return new Iterator() {
-            boolean first = true;
+            boolean first = getCompositionRoot() != null;
 
             public boolean hasNext() {
                 return first;