diff --git a/drivers/media/dvb/frontends/tda18271-fe.c b/drivers/media/dvb/frontends/tda18271-fe.c
index dd3657e459b118f46eca90fe289f3c756dc6aec6..dfe72aaec3802188f3f385d3171d80617c7d903e 100644
--- a/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/drivers/media/dvb/frontends/tda18271-fe.c
@@ -836,7 +836,6 @@ static int tda18271_set_params(struct dvb_frontend *fe,
 
 	priv->mode = TDA18271_DIGITAL;
 
-	/* see table 22 */
 	if (fe->ops.info.type == FE_ATSC) {
 		switch (params->u.vsb.modulation) {
 		case VSB_8:
@@ -884,6 +883,10 @@ static int tda18271_set_params(struct dvb_frontend *fe,
 		return -EINVAL;
 	}
 
+	/* When tuning digital, the analog demod must be tri-stated */
+	if (fe->ops.analog_ops.standby)
+		fe->ops.analog_ops.standby(fe);
+
 	ret = tda18271_tune(fe, sgIF * 1000, freq, bw, std, 0);
 
 	if (ret < 0)