diff --git a/cpp/react/renderer/components/SLContainerSpec/SLContainerShadowNode.cpp b/cpp/react/renderer/components/SLContainerSpec/SLContainerShadowNode.cpp
index a27a207..a4671a0 100644
--- a/cpp/react/renderer/components/SLContainerSpec/SLContainerShadowNode.cpp
+++ b/cpp/react/renderer/components/SLContainerSpec/SLContainerShadowNode.cpp
@@ -63,6 +63,15 @@ void SLContainerShadowNode::layout(LayoutContext layoutContext) {
     nextStateData.scrollPositionUpdated = true;
   }
 
+  /*
+   * Guard case when list was emptied
+   */
+  if (nextStateData.scrollIndex > props.uniqueIds.size()) {
+    nextStateData.scrollIndex = 0;
+    nextStateData.scrollPositionUpdated = true;
+    nextStateData.scrollIndexUpdated = true;
+  }
+
   /*
    * If data is prepended, extend the measurements tree from the beginning
    * to match the new data size. If data is appended, resize the tree at the end
@@ -239,7 +248,7 @@ void SLContainerShadowNode::layout(LayoutContext layoutContext) {
       },
       componentRegistry["ListEmptyComponentUniqueId"]);
 
-    scrollContentBelowOffset.add(1, templateRegistryItem.size);
+    scrollContentBelowOffset.add(0, templateRegistryItem.size);
   }
 
   /*
@@ -272,17 +281,15 @@ void SLContainerShadowNode::layout(LayoutContext layoutContext) {
    */
   this->children_ = containerShadowNodeChildren;
   yogaNode_.setDirty(true);
-
-  /*
-   * Bailout without any state update
-   */
-  if (!props.uniqueIds.size()) {
-    return;
+  
+  if (props.uniqueIds.size()) {
+    nextStateData.firstChildUniqueId = props.uniqueIds.front();
+    nextStateData.lastChildUniqueId = props.uniqueIds.back();
+  } else {
+    nextStateData.firstChildUniqueId = {};
+    nextStateData.lastChildUniqueId = {};
   }
 
-  nextStateData.firstChildUniqueId = props.uniqueIds.front();
-  nextStateData.lastChildUniqueId = props.uniqueIds.back();
-
   if (props.horizontal) {
     nextStateData.scrollContent.height = nextStateData.scrollContainer.height;
     nextStateData.scrollContent.width = (
diff --git a/src/Shadowlist.tsx b/src/Shadowlist.tsx
index fc78e0d..a750ba8 100644
--- a/src/Shadowlist.tsx
+++ b/src/Shadowlist.tsx
@@ -92,10 +92,11 @@ export const Shadowlist = React.forwardRef(
       <SLContainer
         {...props}
         ref={forwardedRef}
-        style={[props.style, props.contentContainerStyle]}
+        style={props.contentContainerStyle}
       >
         {ListHeaderComponent}
-        {props.data.length ? ListChildrenComponent : ListEmptyComponent}
+        {ListChildrenComponent}
+        {ListEmptyComponent}
         {ListFooterComponent}
       </SLContainer>
     );