diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 5dc8a0c9..5426815d 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -152,8 +152,13 @@ const MopidyMiddleware = (function(){
 
                 var state = store.getState();
 
+                if (window.location.protocol == 'https'){
+                    var protocol = 'wss'
+                } else {
+                    var protocol = 'ws'
+                }
                 socket = new Mopidy({
-                    webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws',
+                    webSocketUrl: protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws',
                     callingConvention: 'by-position-or-by-name'
                 });
 
diff --git a/src/js/services/mopidy/reducer.js b/src/js/services/mopidy/reducer.js
index 339a3b6f..34485cf1 100755
--- a/src/js/services/mopidy/reducer.js
+++ b/src/js/services/mopidy/reducer.js
@@ -15,7 +15,8 @@ export default function reducer(mopidy = {}, action){
         case 'MOPIDY_SET_CONFIG':
             return Object.assign({}, mopidy, {
                 host: action.host, 
-                port: action.port
+                port: action.port,
+                ssl: action.ssl
             });
 
         case 'MOPIDY_CHANGE_TRACK':
diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js
index 64990a5b..12c3c5d1 100755
--- a/src/js/services/pusher/middleware.js
+++ b/src/js/services/pusher/middleware.js
@@ -72,8 +72,14 @@ const PusherMiddleware = (function(){
                 if( state.pusher.username ) connection.username = state.pusher.username;
                 connection.username = connection.username.replace(/\W/g, '')
                 
+                if (window.location.protocol == 'https'){
+                    var protocol = 'wss'
+                } else {
+                    var protocol = 'ws'
+                }
+
                 socket = new WebSocket(
-                    'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
+                    protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
                     [ connection.clientid, connection.connection_id, connection.username ]
                 );