diff --git a/src/app/components/stream/status/poll/poll.component.html b/src/app/components/stream/status/poll/poll.component.html
index e310447a..c796a4f9 100644
--- a/src/app/components/stream/status/poll/poll.component.html
+++ b/src/app/components/stream/status/poll/poll.component.html
@@ -1,4 +1,4 @@
-<div class="poll">
+<div class="poll" *ngIf="poll">
     <div *ngIf="!poll.voted && !poll.expired">
         <div *ngFor="let o of options">
             <label class="poll__container">
diff --git a/src/app/components/stream/status/poll/poll.component.ts b/src/app/components/stream/status/poll/poll.component.ts
index 7385105c..44ac2e10 100644
--- a/src/app/components/stream/status/poll/poll.component.ts
+++ b/src/app/components/stream/status/poll/poll.component.ts
@@ -30,6 +30,8 @@ export class PollComponent implements OnInit {
     private _poll: Poll;
     @Input('poll')
     set poll(value: Poll) {
+        if(!value) return;
+
         this._poll = value;
 
         this.pollName = this.poll.id;
diff --git a/src/app/services/streaming.service.ts b/src/app/services/streaming.service.ts
index 6f65bcf7..0a9cc903 100644
--- a/src/app/services/streaming.service.ts
+++ b/src/app/services/streaming.service.ts
@@ -45,7 +45,11 @@ export class StreamingWrapper {
 
     private start(route: string) {
         this.eventSource = new WebSocket(route);
-        this.eventSource.onmessage = x => this.statusParsing(<WebSocketEvent>JSON.parse(x.data));
+        this.eventSource.onmessage = x => {
+            if (x.data !== '') {
+                this.statusParsing(<WebSocketEvent>JSON.parse(x.data));
+            }
+        }
         this.eventSource.onerror = x => this.webSocketGotError(x);
         this.eventSource.onopen = x => { };
         this.eventSource.onclose = x => this.webSocketClosed(route, x);