diff --git a/homeassistant/components/zwave_mqtt/discovery.py b/homeassistant/components/zwave_mqtt/discovery.py
index 69bf9e5c896..86c227b6973 100644
--- a/homeassistant/components/zwave_mqtt/discovery.py
+++ b/homeassistant/components/zwave_mqtt/discovery.py
@@ -65,20 +65,6 @@ DISCOVERY_SCHEMAS = (
     },
     {  # Switch platform
         const.DISC_COMPONENT: "switch",
-        const.DISC_GENERIC_DEVICE_CLASS: (
-            const_ozw.GENERIC_TYPE_METER,
-            const_ozw.GENERIC_TYPE_SENSOR_ALARM,
-            const_ozw.GENERIC_TYPE_SENSOR_BINARY,
-            const_ozw.GENERIC_TYPE_SWITCH_BINARY,
-            const_ozw.GENERIC_TYPE_ENTRY_CONTROL,
-            const_ozw.GENERIC_TYPE_SENSOR_MULTILEVEL,
-            const_ozw.GENERIC_TYPE_SWITCH_MULTILEVEL,
-            const_ozw.GENERIC_TYPE_GENERIC_CONTROLLER,
-            const_ozw.GENERIC_TYPE_SWITCH_REMOTE,
-            const_ozw.GENERIC_TYPE_REPEATER_SLAVE,
-            const_ozw.GENERIC_TYPE_THERMOSTAT,
-            const_ozw.GENERIC_TYPE_WALL_CONTROLLER,
-        ),
         const.DISC_VALUES: {
             const.DISC_PRIMARY: {
                 const.DISC_COMMAND_CLASS: (CommandClass.SWITCH_BINARY,),