diff --git a/homeassistant/components/binary_sensor/rfxtrx.py b/homeassistant/components/binary_sensor/rfxtrx.py
index 1c283ad214a..9a23b419cfc 100644
--- a/homeassistant/components/binary_sensor/rfxtrx.py
+++ b/homeassistant/components/binary_sensor/rfxtrx.py
@@ -31,8 +31,8 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_DEVICES, default={}): {
         cv.string: vol.Schema({
-            vol.Optional(CONF_NAME): cv.string,
-            vol.Optional(CONF_DEVICE_CLASS): cv.string,
+            vol.Optional(CONF_NAME, default=None): cv.string,
+            vol.Optional(CONF_DEVICE_CLASS, default=None): cv.string,
             vol.Optional(CONF_FIRE_EVENT, default=False): cv.boolean,
             vol.Optional(CONF_OFF_DELAY, default=None):
             vol.Any(cv.time_period, cv.positive_timedelta),