diff --git a/package.json b/package.json
index e8c1e213..2444830e 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "mopidy-iris",
+<<<<<<< Updated upstream
   "version": "3.17.1",
+=======
+  "version": "3.17.0",
+>>>>>>> Stashed changes
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",
diff --git a/src/js/services/core/middleware.js b/src/js/services/core/middleware.js
index 7e34b3d5..b9ed387d 100755
--- a/src/js/services/core/middleware.js
+++ b/src/js/services/core/middleware.js
@@ -319,9 +319,18 @@ const CoreMiddleware = (function(){
                     tracks: [action.track]
                 });
 
+                // Set our window title to the track title
+                helpers.setWindowTitle(action.track, store.getState().mopidy.play_state);
+
                 next(action);
                 break;
 
+            case 'CLEAR_CURRENT_TRACK':
+
+                // Set our window title to the track title
+                helpers.setWindowTitle(null, store.getState().mopidy.play_state);
+                break;
+
             case 'QUEUE_LOADED':
                 store.dispatch({
                     type: 'TRACKS_LOADED',
diff --git a/src/js/services/core/reducer.js b/src/js/services/core/reducer.js
index 5278671a..f5f3dc4b 100755
--- a/src/js/services/core/reducer.js
+++ b/src/js/services/core/reducer.js
@@ -17,6 +17,12 @@ export default function reducer(core = {}, action){
                 current_track_uri: action.uri
             });
 
+        case 'CLEAR_CURRENT_TRACK':
+            return Object.assign({}, core, {
+                current_track: null,
+                current_track_uri: null
+            });
+
         case 'NEXT_TRACK_LOADED':
             return Object.assign({}, core, {
                 next_track_uri: action.uri
diff --git a/src/js/services/mopidy/actions.js b/src/js/services/mopidy/actions.js
index 641cf0e1..f029541f 100755
--- a/src/js/services/mopidy/actions.js
+++ b/src/js/services/mopidy/actions.js
@@ -204,9 +204,7 @@ export function getNextTrack(){
 
 export function clearCurrentTrack(){
 	return {
-		type: 'CURRENT_TRACK_LOADED',
-        track: null,
-        uri: null
+		type: 'CLEAR_CURRENT_TRACK'
 	}
 }
 
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 357d0563..83aec6e7 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -2037,8 +2037,6 @@ const MopidyMiddleware = (function(){
                     }
                 }
 
-                // Set our window title to the track title
-                helpers.setWindowTitle(track, store.getState().mopidy.play_state);
                 store.dispatch({
                     type: 'CURRENT_TRACK_LOADED',
                     track: track