diff --git a/packages/components/src/components/ConditionalContainer/index.tsx b/packages/components/src/components/ConditionalContainer/index.tsx
index 5769210..2cf29fe 100644
--- a/packages/components/src/components/ConditionalContainer/index.tsx
+++ b/packages/components/src/components/ConditionalContainer/index.tsx
@@ -36,13 +36,17 @@ const ConditionalContainer = <TRender extends RenderElement, TFallback extends R
     const { element, props: renderProps } = render;
 
     // If (typeof element === 'string') {
-    return createElement(element, renderProps, children);
+    return children
+      ? createElement(element, renderProps, children)
+      : createElement(element, renderProps);
   }
 
   if (!when && fallback) {
     const { element: fallbackElement, props: fallbackProps = {} } = fallback;
 
-    return createElement(fallbackElement, fallbackProps, children);
+    return children
+      ? createElement(fallbackElement, fallbackProps, children)
+      : createElement(fallbackElement, fallbackProps);
   }
 
   // When no `fallback` element is specified