diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb
index f4d728be..5d5d294c 100644
--- a/app/assets/javascripts/editor.js.erb
+++ b/app/assets/javascripts/editor.js.erb
@@ -169,7 +169,6 @@ $(function() {
                 }
             }
            // setAnnotations(editors[i], $(editors[i].container).data('id'));
-            console.log('location: #{Time.now}' + window.location.port);
         }
         // toggle button states (it might be the case that the request for comments button has to be enabled
         toggleButtonStates();
@@ -1121,7 +1120,8 @@ $(function() {
   var initWebsocketConnection = function(url) {
       //TODO: get the protocol from config file dependent on environment. (dev: ws, prod: wss)
       //causes: Puma::HttpParserError: Invalid HTTP format, parsing fails.
-      websocket = new WebSocket('ws://' + window.location.hostname + ':' + window.location.port + url);
+      //TODO: make sure that this gets cached.
+      websocket = new WebSocket('<%= DockerClient.config['ws_client_protocol'] %>' + window.location.hostname + ':' + window.location.port + url);
       websocket.onopen = function(evt) { resetOutputTab(); }; // todo show some kind of indicator for established connection
       websocket.onclose = function(evt) { /* expected at some point */ };
       websocket.onmessage = function(evt) { parseCanvasMessage(evt.data, true); };