diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6eb103d..075fa03 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -136,3 +136,6 @@ Milan Hrala
 
 Valdemaras Pipiras
   for providing Lithuanian language texts
+
+sk8ter
+  for fixing failures when switching between two encrypted channels
diff --git a/HISTORY b/HISTORY
index 605ce4d..eae0139 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- switching between two encrypted channels on the same transponder didn't
+  always work (thanks to sk8ter@vdrportal)
 - added DELT FORCE option to delete running timers (thanks to Alwin Esch)
 - added VDR 1.7.11 parental rating support for VTP LSTE command (thanks to
   Alwin Esch)
diff --git a/client/device.c b/client/device.c
index d7a09a6..551d7c2 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.24 2009/10/19 06:19:10 schmirl Exp $
+ *  $Id: device.c,v 1.25 2010/02/17 12:39:03 schmirl Exp $
  */
  
 #include "client/device.h"
@@ -72,7 +72,9 @@ bool cStreamdevDevice::IsTunedToTransponder(const cChannel *Channel)
 {
 	bool res = false;
 	if (ClientSocket.DataSocket(siLive) != NULL
-			&& TRANSPONDER(Channel, m_Channel))
+			&& TRANSPONDER(Channel, m_Channel)
+			&& Channel->Ca() == CA_FTA
+			&& m_Channel->Ca() == CA_FTA)
 		res = true;
 	return res;
 }
@@ -125,7 +127,8 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
 
 	if (ClientSocket.DataSocket(siLive) != NULL 
 			&& TRANSPONDER(Channel, m_Channel)
-			&& Channel->Ca() == m_Channel->Ca())
+			&& Channel->Ca() == CA_FTA
+			&& m_Channel->Ca() == CA_FTA)
 		return true;
 
 	DetachAllReceivers();