diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c
index e8d784b9d119..308599b2e479 100644
--- a/drivers/media/usb/dvb-usb/opera1.c
+++ b/drivers/media/usb/dvb-usb/opera1.c
@@ -379,6 +379,8 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
 	int i = 0;
 	u32 send_key = 0;
 
+	*state = REMOTE_NO_KEY_PRESSED;
+
 	if (i2c_transfer(&dev->i2c_adap, read_remote, 1) == 1) {
 		for (i = 0; i < 32; i++) {
 			if (rcbuffer[i])
@@ -420,8 +422,8 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
 			}
 			opst->last_key_pressed = 0;
 		}
-	} else
-		*state = REMOTE_NO_KEY_PRESSED;
+	}
+
 	return 0;
 }