diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 3d0e81bd5..6af6f2636 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -11,7 +11,7 @@ import {
   authActions
 } from '../../coral-framework';
 
-import Comment from './Comment';
+import Stream from './Stream';
 
 import CommentBox from '../../coral-plugin-commentbox/CommentBox';
 import InfoBox from '../../coral-plugin-infobox/InfoBox';
@@ -153,11 +153,7 @@ class Embed extends Component {
                     refetch={refetch}
                     showSignInDialog={showSignInDialog}/>
                 }
-                {
-                  asset.comments.map(comment => {
-                    return <Comment key={comment.id} comment={comment} />;
-                  })
-                }
+                <Stream comments={asset.comments} />
             {
              <Notification
                notifLength={4500}
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index e69de29bb..13dbaf35d 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -0,0 +1,20 @@
+import React, {Component, PropTypes} from 'react';
+import Comment from './Comment';
+
+const Stream = ({comments}) => {
+  return (
+    <div>
+      {
+        comments.map(comment => {
+          return <Comment key={comment.id} comment={comment} />;
+        })
+      }
+    </div>
+  );
+};
+
+Stream.propTypes = {
+  comments: PropTypes.array.isRequired
+};
+
+export default Stream;