diff --git a/tuner.c b/tuner.c
index 89a3623..219a556 100644
--- a/tuner.c
+++ b/tuner.c
@@ -120,12 +120,15 @@ void cSatipTuner::Action(void)
                break;
           case tsSet:
                debug4("%s: tsSet [device %d]", __PRETTY_FUNCTION__, deviceIdM);
+               // some devices require TEARDOWN before new PLAY command
                Disconnect();
                if (Connect()) {
                   tuning.Set(eTuningTimeoutMs);
                   RequestState(tsTuned, smInternal);
                   UpdatePids(true);
                   }
+               else
+                  Disconnect();
                break;
           case tsTuned:
                debug4("%s: tsTuned [device %d]", __PRETTY_FUNCTION__, deviceIdM);