diff --git a/drivers/bluetooth/nitrous.c b/drivers/bluetooth/nitrous.c
index 24ec6efe86f5083e540c8a8fde2cf429e759bcc1..f9c7d4638ec9e285e64d710d676c4424b7e5e132 100644
--- a/drivers/bluetooth/nitrous.c
+++ b/drivers/bluetooth/nitrous.c
@@ -383,14 +383,13 @@ static int nitrous_rfkill_init(struct platform_device *pdev,
 		goto err_rfkill_alloc;
 	}
 
+	/* Make sure rfkill core is initialized to be blocked initially. */
+	rfkill_init_sw_state(lpm->rfkill, true);
 	rc = rfkill_register(lpm->rfkill);
 	if (unlikely(rc))
 		goto err_rfkill_register;
 
-	rfkill_set_states(lpm->rfkill, true, false);
-	/* Set blocked state to false, so the call to
-	   bt_rfkill_set_power can run and set blocked to true */
-	lpm->rfkill_blocked = false;
+	/* Power off chip at startup. */
 	nitrous_rfkill_set_power(lpm, true);
 	return 0;