diff --git a/raspberry/roberto/views/frontend/templates/index.html b/raspberry/roberto/views/frontend/templates/index.html
index 9ee21ed..2bd7a76 100644
--- a/raspberry/roberto/views/frontend/templates/index.html
+++ b/raspberry/roberto/views/frontend/templates/index.html
@@ -97,7 +97,7 @@
       function onLocalDescription(desc) {
         console.log("Local description: " + JSON.stringify(desc));
         webrtcPeerConnection.setLocalDescription(desc).then(function() {
-          socket.emit('message', { type: "sdp", "data": webrtcPeerConnection.localDescription });
+          socket.emit('message', { "type": "sdp", "data": webrtcPeerConnection.localDescription });
         }).catch(reportError);
       }
 
@@ -227,7 +227,7 @@ var statsInterval = window.setInterval(getConnectionStats, 1000);
 
 setInterval(function(){
     if (socket.connected) {
-        socket.emit('ping');
+        socket.emit('ping_message', { "type": "ping" });
     }
 }, 5000);
 
diff --git a/raspberry/roberto/views/websocket/routes.py b/raspberry/roberto/views/websocket/routes.py
index f3f443d..f019b4c 100644
--- a/raspberry/roberto/views/websocket/routes.py
+++ b/raspberry/roberto/views/websocket/routes.py
@@ -90,6 +90,11 @@ def webrtc_message(data):
         print("unknown message type")
     socketio.emit('message', data=data, room=ROOM, namespace='/webrtc', skip_sid=sid)
 
+@socketio.on('ping_message', namespace='/webrtc')
+def ping_message(data):
+    sid = request.sid
+    print("Received ping from %s" % sid)
+    socketio.emit('ping_message', data={ 'type':'pong' }, room=sid, namespace='/webrtc')
 
 @socketio.on('disconnect', namespace='/webrtc')
 def disconnect():
@@ -111,11 +116,6 @@ def connect():
     if sid != webrtccamera.sid:
         serial.add_callback('B', display_battery)
 
-@socketio.on('ping', namespace='/webrtc')
-def ping():
-    sid = request.sid
-    print("Received ping from %s" % sid)
-
 @socketio.on_error_default
 def default_error_handler(e):
     print(request.event["message"]) # "my error event"