diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index 93802487f25..33dfa690632 100755 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -430,7 +430,8 @@ def setup(hass, config): """Stop Z-Wave network.""" _LOGGER.info("Stopping ZWave network.") NETWORK.stop() - hass.bus.fire(const.EVENT_NETWORK_STOP) + if hass.state == 'RUNNING': + hass.bus.fire(const.EVENT_NETWORK_STOP) def rename_node(service): """Rename a node."""