diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 6abba08fe..7e9086a9f 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -451,16 +451,16 @@
             var sessionScreen = new JK.SessionScreen(jk);
             sessionScreen.initialize();
 
-            // Disabled for now to debug p2p messaging
-            //var messaging = new JK.Messaging(jk);
-            //messaging.register();
+            var messaging = new JK.Messaging(jk);
+            messaging.register();
 
             var jam_server = JK.JamServer;
 
             if (jamClient !== undefined) {
                 jam_server.registerMessageCallback(JK.MessageType.LOGIN_ACK, function(type, payload) { 
                     // This is just a test to kick off sending a few messages to self
-                    jamClient.JoinSession({ sessionID : 'just a test'});
+                    // TODO: We need a session first to send p2p messages
+                    //jamClient.JoinSession({ sessionID : 'just a test'});
                 });
             }