diff --git a/src/store/player.js b/src/store/player.js
index f5d259a..418c95f 100644
--- a/src/store/player.js
+++ b/src/store/player.js
@@ -77,9 +77,11 @@ export default ({
 			if (state.isPlaying) {
 				state.isPlaying = false
 				state.isPaused = true
+				player.doPause()
 			} else {
 				state.isPlaying = true
 				state.isPaused = false
+				player.doResume()
 			}
 		},
 		setTitle(state, title) {
@@ -109,7 +111,7 @@ export default ({
 			context.commit('setBuffering', true)
 			context.commit('setTitle', station.name)
 			context.commit('setPausing', false)
-			player.doPlay(station.url_resolved)
+			player.doPlay(station.url_resolved || station.urlresolved)
 		},
 
 	},