diff --git a/client/app/scripts/components/cloud-link.js b/client/app/scripts/components/cloud-link.js
index 315919e7b..84933e0bd 100644
--- a/client/app/scripts/components/cloud-link.js
+++ b/client/app/scripts/components/cloud-link.js
@@ -57,7 +57,7 @@ class LinkWrapper extends React.Component {
   render() {
     const { url, children, ...props } = this.props;
     if (!url) {
-      return children;
+      return React.isValidElement(children) ? children : (<span>{children}</span>);
     }
 
     const href = this.buildHref(url);