diff --git a/server/index.js b/server/index.js
index 36a0f62..2c53951 100644
--- a/server/index.js
+++ b/server/index.js
@@ -26,8 +26,13 @@ class SnapdropServer {
     }
 
     _onMessage(sender, message) {
-        message = JSON.parse(message);
-
+        // Try to parse message 
+        try {
+            message = JSON.parse(message);
+        } catch (e) {
+            return; // TODO: handle malformed JSON
+        }
+        
         switch (message.type) {
             case 'disconnect':
                 this._leaveRoom(sender);
@@ -221,4 +226,4 @@ class Peer {
     };
 }
 
-const server = new SnapdropServer(process.env.PORT || 3000);
\ No newline at end of file
+const server = new SnapdropServer(process.env.PORT || 3000);