diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index 66e14ca9a5a..e6cfab90c26 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -90,7 +90,7 @@ DEFAULT_TILT_MIN = 0
 DEFAULT_TILT_OPEN_POSITION = 100
 DEFAULT_TILT_OPTIMISTIC = False
 
-OPEN_CLOSE_FEATURES = SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_STOP
+OPEN_CLOSE_FEATURES = SUPPORT_OPEN | SUPPORT_CLOSE
 TILT_FEATURES = (
     SUPPORT_OPEN_TILT
     | SUPPORT_CLOSE_TILT
@@ -122,7 +122,9 @@ PLATFORM_SCHEMA = vol.All(
             vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
             vol.Optional(CONF_PAYLOAD_CLOSE, default=DEFAULT_PAYLOAD_CLOSE): cv.string,
             vol.Optional(CONF_PAYLOAD_OPEN, default=DEFAULT_PAYLOAD_OPEN): cv.string,
-            vol.Optional(CONF_PAYLOAD_STOP, default=DEFAULT_PAYLOAD_STOP): cv.string,
+            vol.Optional(CONF_PAYLOAD_STOP, default=DEFAULT_PAYLOAD_STOP): vol.Any(
+                cv.string, None
+            ),
             vol.Optional(CONF_POSITION_CLOSED, default=DEFAULT_POSITION_CLOSED): int,
             vol.Optional(CONF_POSITION_OPEN, default=DEFAULT_POSITION_OPEN): int,
             vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
@@ -396,6 +398,9 @@ class MqttCover(
         if self._config.get(CONF_COMMAND_TOPIC) is not None:
             supported_features = OPEN_CLOSE_FEATURES
 
+            if self._config.get(CONF_PAYLOAD_STOP) is not None:
+                supported_features |= SUPPORT_STOP
+
         if self._config.get(CONF_SET_POSITION_TOPIC) is not None:
             supported_features |= SUPPORT_SET_POSITION
 
diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py
index 12a43030aa8..bb734d2c03d 100644
--- a/tests/components/mqtt/test_cover.py
+++ b/tests/components/mqtt/test_cover.py
@@ -546,6 +546,27 @@ async def test_no_command_topic(hass, mqtt_mock):
     assert hass.states.get("cover.test").attributes["supported_features"] == 240
 
 
+async def test_no_payload_stop(hass, mqtt_mock):
+    """Test with no stop payload."""
+    assert await async_setup_component(
+        hass,
+        cover.DOMAIN,
+        {
+            cover.DOMAIN: {
+                "platform": "mqtt",
+                "name": "test",
+                "command_topic": "command-topic",
+                "qos": 0,
+                "payload_open": "OPEN",
+                "payload_close": "CLOSE",
+                "payload_stop": None,
+            }
+        },
+    )
+
+    assert hass.states.get("cover.test").attributes["supported_features"] == 3
+
+
 async def test_with_command_topic_and_tilt(hass, mqtt_mock):
     """Test with command topic and tilt config."""
     assert await async_setup_component(