diff --git a/src/divider/Divider.tsx b/src/divider/Divider.tsx
index d578f31c8..dd78284ba 100644
--- a/src/divider/Divider.tsx
+++ b/src/divider/Divider.tsx
@@ -30,24 +30,20 @@ const Divider = (props: DividerProps) => {
   } = props;
 
   const { classPrefix } = useConfig();
-  const hasChildren = typeof children !== 'undefined';
-  const hasContent = typeof content !== 'undefined';
-  let childrenNode = children;
+  const childrenNode = content || children;
+
+  const showText = layout !== 'vertical' && !!childrenNode;
 
-  if (!hasChildren && hasContent) {
-    childrenNode = content;
-  }
   const dividerClassNames = classNames(`${classPrefix}-divider`, className, {
-    [`${classPrefix}-divider--horizontal`]: layout === 'horizontal',
-    [`${classPrefix}-divider--vertical`]: layout === 'vertical',
+    [`${classPrefix}-divider--${layout}`]: layout,
     [`${classPrefix}-divider--dashed`]: !!dashed,
-    [`${classPrefix}-divider--with-text`]: !!childrenNode,
-    [`${classPrefix}-divider--with-text-${align}`]: !!childrenNode,
+    [`${classPrefix}-divider--with-text`]: showText,
+    [`${classPrefix}-divider--with-text-${align}`]: showText,
   });
 
   return (
     <div {...otherDividerProps} className={dividerClassNames} style={style}>
-      {childrenNode ? <span className={`${classPrefix}-divider__inner-text`}>{childrenNode}</span> : null}
+      {showText ? <span className={`${classPrefix}-divider__inner-text`}>{childrenNode}</span> : null}
     </div>
   );
 };