diff --git a/src/client/__tests__/App-test.js b/src/client/__tests__/App-test.js
index 7f3a997..b5f485e 100644
--- a/src/client/__tests__/App-test.js
+++ b/src/client/__tests__/App-test.js
@@ -47,6 +47,9 @@ describe('App', () => {
       state.streams = state.streams.merge({
         test: 'blob://'
       })
+      state.peers = {
+        test: {}
+      }
       state.notifications = state.notifications.merge({
         'notification1': {
           id: 'notification1',
@@ -83,7 +86,7 @@ describe('App', () => {
         TestUtils.Simulate.click(video)
         expect(store.getActions()).toEqual([{
           type: constants.ACTIVE_TOGGLE,
-          payload: { userId: 'test' }
+          payload: { userId: constants.ME }
         }])
       })
     })
diff --git a/src/client/components/App.js b/src/client/components/App.js
index 9d25e61..6b627c5 100644
--- a/src/client/components/App.js
+++ b/src/client/components/App.js
@@ -1,4 +1,5 @@
 import Alerts, { AlertPropType } from './Alerts.js'
+import * as constants from '../constants.js'
 import Input from './Input.js'
 import Notifications, { NotificationPropTypes } from './Notifications.js'
 import PropTypes from 'prop-types'
@@ -8,15 +9,16 @@ import _ from 'underscore'
 
 export default class App extends React.Component {
   static propTypes = {
-    dismissAlert: PropTypes.func.isRequired,
-    streams: PropTypes.objectOf(PropTypes.string).isRequired,
-    alerts: PropTypes.arrayOf(AlertPropType).isRequired,
-    toggleActive: PropTypes.func.isRequired,
     active: PropTypes.string,
+    alerts: PropTypes.arrayOf(AlertPropType).isRequired,
+    dismissAlert: PropTypes.func.isRequired,
     init: PropTypes.func.isRequired,
-    notify: PropTypes.func.isRequired,
     notifications: PropTypes.objectOf(NotificationPropTypes).isRequired,
-    sendMessage: PropTypes.func.isRequired
+    notify: PropTypes.func.isRequired,
+    peers: PropTypes.object.isRequired,
+    sendMessage: PropTypes.func.isRequired,
+    streams: PropTypes.objectOf(PropTypes.string).isRequired,
+    toggleActive: PropTypes.func.isRequired
   }
   componentDidMount () {
     const { init } = this.props
@@ -29,6 +31,7 @@ export default class App extends React.Component {
       dismissAlert,
       notifications,
       notify,
+      peers,
       sendMessage,
       toggleActive,
       streams
@@ -39,12 +42,19 @@ export default class App extends React.Component {
       <Notifications notifications={notifications} />
       <Input notify={notify} sendMessage={sendMessage} />
       <div className="videos">
-        {_.map(streams, (stream, userId) => (
+        <Video
+          active={active === constants.ME}
+          onClick={toggleActive}
+          stream={streams[constants.ME]}
+          userId={constants.ME}
+        />
+
+        {_.map(peers, (_, userId) => (
           <Video
             active={userId === active}
             key={userId}
             onClick={toggleActive}
-            stream={stream}
+            stream={streams[userId]}
             userId={userId}
           />
         ))}
diff --git a/src/client/components/Video.js b/src/client/components/Video.js
index f59aeaf..fac6378 100644
--- a/src/client/components/Video.js
+++ b/src/client/components/Video.js
@@ -7,7 +7,7 @@ export default class Video extends React.Component {
   static propTypes = {
     onClick: PropTypes.func,
     active: PropTypes.bool.isRequired,
-    stream: PropTypes.string.isRequired,
+    stream: PropTypes.string,
     userId: PropTypes.string.isRequired
   }
   handleClick = e => {
diff --git a/src/client/containers/App.js b/src/client/containers/App.js
index 0fa2d6c..0d97f05 100644
--- a/src/client/containers/App.js
+++ b/src/client/containers/App.js
@@ -9,6 +9,7 @@ import { connect } from 'react-redux'
 function mapStateToProps (state) {
   return {
     streams: state.streams,
+    peers: state.peers,
     alerts: state.alerts,
     notifications: state.notifications,
     active: state.active