2 files changed, 4 insertions, 8 deletions
diff --git a/src/web/app/common/mixins/index.js b/src/web/app/common/mixins/index.js
index 29cb6c9b6a..9718ee949b 100644
--- a/src/web/app/common/mixins/index.js
+++ b/src/web/app/common/mixins/index.js
@@ -2,8 +2,8 @@ import activateMe from './i';
 import activateApi from './api';
 import activateStream from './stream';
 
-export default me => {
+export default (me, stream) => {
 	activateMe(me);
 	activateApi(me);
-	activateStream(me);
+	activateStream(stream);
 };
diff --git a/src/web/app/common/mixins/stream.js b/src/web/app/common/mixins/stream.js
index e3b616a1a5..4706042b04 100644
--- a/src/web/app/common/mixins/stream.js
+++ b/src/web/app/common/mixins/stream.js
@@ -1,9 +1,5 @@
 import * as riot from 'riot';
-import Connection from '../scripts/stream';
 
-export default me => {
-	const stream = me ? new Connection(me) : null;
-	riot.mixin('stream', {
-		stream: stream
-	});
+export default stream => {
+	riot.mixin('stream', { stream });
 };