diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 5dc8a0c9..d5b99658 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -153,7 +153,7 @@ const MopidyMiddleware = (function(){
                 var state = store.getState();
 
                 socket = new Mopidy({
-                    webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws',
+                    webSocketUrl: 'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+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..0cae63d9 100755
--- a/src/js/services/pusher/middleware.js
+++ b/src/js/services/pusher/middleware.js
@@ -73,7 +73,7 @@ const PusherMiddleware = (function(){
                 connection.username = connection.username.replace(/\W/g, '')
                 
                 socket = new WebSocket(
-                    'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
+                    'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
                     [ connection.clientid, connection.connection_id, connection.username ]
                 );
 
@@ -344,4 +344,4 @@ const PusherMiddleware = (function(){
 
 })();
 
-export default PusherMiddleware
\ No newline at end of file
+export default PusherMiddleware