diff --git a/pages/container/simple.page.tsx b/pages/container/simple.page.tsx
index 98d81ef63f..a8e1293f77 100644
--- a/pages/container/simple.page.tsx
+++ b/pages/container/simple.page.tsx
@@ -102,6 +102,10 @@ export default function SimpleContainers() {
               Content area takes the available vertical space
             </Container>
           </div>
+          <Container
+            disableContentPaddings={true}
+            header={<Header variant="h2">Container Without Content</Header>}
+          ></Container>
         </SpaceBetween>
       </ScreenshotArea>
     </article>
diff --git a/src/container/index.tsx b/src/container/index.tsx
index f15ad4d36a..b2b060a219 100644
--- a/src/container/index.tsx
+++ b/src/container/index.tsx
@@ -24,6 +24,7 @@ export default function Container({
       disableContentPaddings={disableContentPaddings}
       {...externalProps}
       {...baseComponentProps}
+      __hiddenContent={!props.children}
     />
   );
 }