diff --git a/streamviewer/server.py b/streamviewer/server.py
index 58a87e1c9c7b1b6ac93efdd70743c21e4ff846a2..7eecf5ab299427094d8f429c982c40234b2def0c 100644
--- a/streamviewer/server.py
+++ b/streamviewer/server.py
@@ -146,10 +146,12 @@ def on_publish_done():
         return "Only allowed from localhost", 403
     streamingkey = request.values.get("name")
     app.logger.info('Existing RTMP stream \"{}\" ended'.format(streamingkey))
+    stream = streamlist.get_stream(streamingkey)
     streamlist.remove_stream(streamingkey)
-    json_list = streamlist.json_list()
-    app.logger.debug('Sending JSON list {}'.format(json_list))
-    socketio.emit('stream_removed', {'key': streamingkey, 'list': json_list}, broadcast=True)
+    if not stream.unlisted:
+        json_list = streamlist.json_list()
+        app.logger.debug('Sending JSON list {}'.format(json_list))
+        socketio.emit('stream_removed', {'key': streamingkey, 'list': json_list}, broadcast=True)
 
     return "Ok", 200