diff --git a/include/kodivideochecker/KODIVideoChecker.h b/include/kodivideochecker/KODIVideoChecker.h
index a1b6596e..93fd93fc 100644
--- a/include/kodivideochecker/KODIVideoChecker.h
+++ b/include/kodivideochecker/KODIVideoChecker.h
@@ -87,8 +87,6 @@ private:
 	
 	/// Set the grabbing mode
 	void setGrabbingMode(GrabbingMode grabbingMode);
-
-	void setScreensaverMode(bool isOnScreensaver);
 	
 	/// Set the video mode
 	void setVideoMode(VideoMode videoMode);
@@ -138,9 +136,6 @@ private:
 
 	/// Flag indicating wheter or not to enable the detection of 3D movies playing
 	bool _enable3DDetection;
-
-	/// Flag indicating if KODI is on screensaver
-	bool _previousScreensaverMode;
 	
 	/// Previous emitted grab mode
 	GrabbingMode _previousGrabbingMode;
diff --git a/include/utils/GrabbingMode.h b/include/utils/GrabbingMode.h
index c97aaa8e..83f06beb 100644
--- a/include/utils/GrabbingMode.h
+++ b/include/utils/GrabbingMode.h
@@ -13,5 +13,6 @@ enum GrabbingMode
 	GRABBINGMODE_PHOTO,
 	GRABBINGMODE_AUDIO,
 	GRABBINGMODE_MENU,
+	GRABBINGMODE_SCREENSAVER,
 	GRABBINGMODE_INVALID
 };
diff --git a/libsrc/grabber/amlogic/AmlogicWrapper.cpp b/libsrc/grabber/amlogic/AmlogicWrapper.cpp
index e9f59f3f..afcb6def 100644
--- a/libsrc/grabber/amlogic/AmlogicWrapper.cpp
+++ b/libsrc/grabber/amlogic/AmlogicWrapper.cpp
@@ -87,6 +87,7 @@ void AmlogicWrapper::setGrabbingMode(const GrabbingMode mode)
 	case GRABBINGMODE_AUDIO:
 	case GRABBINGMODE_PHOTO:
 	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_SCREENSAVER:
 	case GRABBINGMODE_INVALID:
 //		_frameGrabber->setFlags(0);
 		start();
diff --git a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp
index f2783deb..5ab45534 100644
--- a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp
+++ b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp
@@ -82,6 +82,7 @@ void DispmanxWrapper::setGrabbingMode(const GrabbingMode mode)
 	case GRABBINGMODE_AUDIO:
 	case GRABBINGMODE_PHOTO:
 	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_SCREENSAVER:
 	case GRABBINGMODE_INVALID:
 		_frameGrabber->setFlags(0);
 		start();
diff --git a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp
index 0e0c2c8f..c64fe9bf 100644
--- a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp
+++ b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp
@@ -68,6 +68,7 @@ void FramebufferWrapper::setGrabbingMode(const GrabbingMode mode)
 	case GRABBINGMODE_AUDIO:
 	case GRABBINGMODE_PHOTO:
 	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_SCREENSAVER:
 	case GRABBINGMODE_INVALID:
 		start();
 		break;
diff --git a/libsrc/grabber/osx/OsxWrapper.cpp b/libsrc/grabber/osx/OsxWrapper.cpp
index afde051f..3654209b 100644
--- a/libsrc/grabber/osx/OsxWrapper.cpp
+++ b/libsrc/grabber/osx/OsxWrapper.cpp
@@ -68,6 +68,7 @@ void OsxWrapper::setGrabbingMode(const GrabbingMode mode)
 	case GRABBINGMODE_AUDIO:
 	case GRABBINGMODE_PHOTO:
 	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_SCREENSAVER:
 	case GRABBINGMODE_INVALID:
 		start();
 		break;
diff --git a/libsrc/kodivideochecker/KODIVideoChecker.cpp b/libsrc/kodivideochecker/KODIVideoChecker.cpp
index 4b013abc..f64f14dd 100644
--- a/libsrc/kodivideochecker/KODIVideoChecker.cpp
+++ b/libsrc/kodivideochecker/KODIVideoChecker.cpp
@@ -56,7 +56,6 @@ KODIVideoChecker::KODIVideoChecker(const std::string & address, uint16_t port, b
 	, _grabPause(grabPause)
 	, _grabScreensaver(grabScreensaver)
 	, _enable3DDetection(enable3DDetection)
-	, _previousScreensaverMode(false)
 	, _previousGrabbingMode(GRABBINGMODE_INVALID)
 	, _previousVideoMode(VIDEO_2D)
 	, _kodiVersion(0)
@@ -87,7 +86,6 @@ void KODIVideoChecker::setConfig(const std::string & address, uint16_t port, boo
 	_grabPause               = grabPause;
 	_grabScreensaver         = grabScreensaver;
 	_enable3DDetection       = enable3DDetection;
-	_previousScreensaverMode = false;
 	_previousGrabbingMode    = GRABBINGMODE_INVALID;
 	_previousVideoMode       = VIDEO_2D;
 	_kodiVersion             = 0;
@@ -126,7 +124,7 @@ void KODIVideoChecker::receiveReply()
 		if (doc.isObject())
 		{
 			Debug(_log, "message: %s", doc.toJson(QJsonDocument::Compact).constData());
-
+			
 			// Reply
 			if (doc.object().contains("id"))
 			{
@@ -145,7 +143,7 @@ void KODIVideoChecker::receiveReply()
 								emit videoMode(VIDEO_2D);
 
 								QString type = resultArray[0].toObject()["type"].toString();
-								int playerid = resultArray[0].toObject()["playerid"].toInt();								
+								int playerid = resultArray[0].toObject()["playerid"].toInt();
 
 								if (type == "video")
 								{
@@ -200,7 +198,10 @@ void KODIVideoChecker::receiveReply()
 						if (doc.object()["result"].toObject().contains("System.ScreenSaverActive"))
 						{
 							// result of System.ScreenSaverActive
-							setScreensaverMode(!_grabScreensaver && doc.object()["result"].toObject()["System.ScreenSaverActive"].toBool());
+							if (doc.object()["result"].toObject()["System.ScreenSaverActive"].toBool())
+								setGrabbingMode(_grabScreensaver ? GRABBINGMODE_SCREENSAVER : GRABBINGMODE_OFF);
+							else
+								_socket.write(_activePlayerRequest.toUtf8());
 
 							// check here kodi version
 							if (_socket.state() == QTcpSocket::ConnectedState)
@@ -258,9 +259,9 @@ void KODIVideoChecker::receiveReply()
 					// player at pause
 					setGrabbingMode(_grabPause ? GRABBINGMODE_PAUSE : GRABBINGMODE_OFF);
 				else if (method == "GUI.OnScreensaverActivated")
-					setScreensaverMode(!_grabScreensaver);
+					setGrabbingMode(_grabScreensaver ? GRABBINGMODE_SCREENSAVER : GRABBINGMODE_OFF);
 				else if (method == "GUI.OnScreensaverDeactivated")
-					setScreensaverMode(false);
+					_socket.write(_activePlayerRequest.toUtf8());
 				else if (method == "Playlist.OnAdd" &&
 					(doc.object()["params"]
 					.toObject()["data"]
@@ -290,6 +291,9 @@ void KODIVideoChecker::connected()
 void KODIVideoChecker::disconnected()
 {
 	Info(_log, "Disconnected");
+	_previousGrabbingMode    = GRABBINGMODE_INVALID;
+	_previousVideoMode       = VIDEO_2D;
+	_kodiVersion             = 0;
 	reconnect();
 }
 
@@ -357,31 +361,18 @@ void KODIVideoChecker::setGrabbingMode(GrabbingMode newGrabbingMode)
 	case GRABBINGMODE_OFF:
 		Info(_log, "switching to OFF mode");
 		break;
+	case GRABBINGMODE_SCREENSAVER:
+		Info(_log, "switching to SCREENSAVER mode");
+		break;
 	default:
 		Warning(_log, "switching to INVALID mode");
 		break;
 	}
 
-	// only emit the new state when we want to grab in screensaver mode or when the screensaver is deactivated
-	if (!_previousScreensaverMode)
-	{
-		emit grabbingMode(newGrabbingMode);
-	}
+	emit grabbingMode(newGrabbingMode);
 	_previousGrabbingMode = newGrabbingMode;
 }
 
-void KODIVideoChecker::setScreensaverMode(bool isOnScreensaver)
-{
-	if (isOnScreensaver == _previousScreensaverMode)
-	{
-		// no change
-		return;
-	}
-
-	emit grabbingMode(isOnScreensaver ? GRABBINGMODE_OFF : _previousGrabbingMode);
-	_previousScreensaverMode = isOnScreensaver;
-}
-
 void KODIVideoChecker::setVideoMode(VideoMode newVideoMode)
 {
 	if (newVideoMode == _previousVideoMode)
diff --git a/libsrc/protoserver/ProtoConnection.cpp b/libsrc/protoserver/ProtoConnection.cpp
index d9e8d0c0..42e8babe 100644
--- a/libsrc/protoserver/ProtoConnection.cpp
+++ b/libsrc/protoserver/ProtoConnection.cpp
@@ -229,7 +229,7 @@ bool ProtoConnection::parseReply(const proto::HyperionReply &reply)
 		}
 		case proto::HyperionReply::GRABBING:
 		{
-			int grabbing = reply.has_grabbing() ? reply.grabbing() : 6;
+			int grabbing = reply.has_grabbing() ? reply.grabbing() : 7;
 			GrabbingMode gMode = (GrabbingMode)grabbing;
 			emit setGrabbingMode(gMode);
 			break;
diff --git a/src/hyperion-x11/X11Wrapper.cpp b/src/hyperion-x11/X11Wrapper.cpp
index 66c74693..53b4cb44 100644
--- a/src/hyperion-x11/X11Wrapper.cpp
+++ b/src/hyperion-x11/X11Wrapper.cpp
@@ -49,6 +49,7 @@ void X11Wrapper::setGrabbingMode(const GrabbingMode mode)
 	case GRABBINGMODE_AUDIO:
 	case GRABBINGMODE_PHOTO:
 	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_SCREENSAVER:
 	case GRABBINGMODE_INVALID:
 		start();
 		break;