diff --git a/src/Breakpoint/Breakpoint.js b/src/Breakpoint/Breakpoint.js
index 1168ec1..ac04c2b 100644
--- a/src/Breakpoint/Breakpoint.js
+++ b/src/Breakpoint/Breakpoint.js
@@ -71,8 +71,9 @@ export default class Breakpoint extends React.Component {
     if (!shouldRender) return null;
 
     const Tag = tagName
+    const breakpointName = breakpoint ? `${breakpoint}-${modifier}` : "custom";
     return (
-      <Tag className={`breakpoint__${breakpoint}-${modifier} ${className}`} style={style}>{children}</Tag>
+      <Tag className={`breakpoint__${breakpointName} ${className}`} style={style}>{children}</Tag>
     );
   }
 }