diff --git a/lib/python/Components/Sources/CurrentService.py b/lib/python/Components/Sources/CurrentService.py
index 4021c8c054..997b9e1505 100644
--- a/lib/python/Components/Sources/CurrentService.py
+++ b/lib/python/Components/Sources/CurrentService.py
@@ -25,6 +25,7 @@ def __init__(self, navcore):
 		self.navcore = navcore
 		self.srv = None
 		self.info = None
+		self.ref = None
 		self.onManualNewService = []
 
 	def serviceEvent(self, event):
@@ -50,11 +51,16 @@ def getCurrentServiceWithFallback(self):
 
 	@cached
 	def getCurrentServiceRef(self):
+		if self.ref:
+			return self.ref
 		if NavigationInstance.instance is not None:
 			return NavigationInstance.instance.getCurrentlyPlayingServiceOrGroup()
 		return None
+	
+	def setCurrentServiceRef(self, ref):
+		self.ref = ref
 
-	serviceref = property(getCurrentServiceRef)
+	serviceref = property(getCurrentServiceRef, setCurrentServiceRef)
 
 	def newService(self, ref):
 		if ref and isinstance(ref, bool):