diff --git a/homeassistant/auth.py b/homeassistant/auth.py
index 7c01776b7b1..5e434b74ca8 100644
--- a/homeassistant/auth.py
+++ b/homeassistant/auth.py
@@ -347,6 +347,9 @@ class AuthManager:
 
     async def _async_finish_login_flow(self, result):
         """Result of a credential login flow."""
+        if result['type'] != data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
+            return None
+
         auth_provider = self._providers[result['handler']]
         return await auth_provider.async_get_or_create_credentials(
             result['data'])
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 1350cd7d76a..8a73e424fb5 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -347,6 +347,15 @@ class ConfigEntries:
 
     async def _async_finish_flow(self, result):
         """Finish a config flow and add an entry."""
+        # If no discovery config entries in progress, remove notification.
+        if not any(ent['source'] in DISCOVERY_SOURCES for ent
+                   in self.hass.config_entries.flow.async_progress()):
+            self.hass.components.persistent_notification.async_dismiss(
+                DISCOVERY_NOTIFICATION_ID)
+
+        if result['type'] != data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
+            return None
+
         entry = ConfigEntry(
             version=result['version'],
             domain=result['handler'],
@@ -370,12 +379,6 @@ class ConfigEntries:
         if result['source'] not in DISCOVERY_SOURCES:
             return entry
 
-        # If no discovery config entries in progress, remove notification.
-        if not any(ent['source'] in DISCOVERY_SOURCES for ent
-                   in self.hass.config_entries.flow.async_progress()):
-            self.hass.components.persistent_notification.async_dismiss(
-                DISCOVERY_NOTIFICATION_ID)
-
         return entry
 
     async def _async_create_flow(self, handler, *, source, data):
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index e9580aba273..5095297e795 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -110,11 +110,11 @@ class FlowManager:
         # Abort and Success results both finish the flow
         self._progress.pop(flow.flow_id)
 
-        if result['type'] == RESULT_TYPE_ABORT:
-            return result
-
         # We pass a copy of the result because we're mutating our version
-        result['result'] = await self._async_finish_flow(dict(result))
+        entry = await self._async_finish_flow(dict(result))
+
+        if result['type'] == RESULT_TYPE_CREATE_ENTRY:
+            result['result'] = entry
         return result
 
 
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 1518706db55..84bd0771542 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -284,3 +284,23 @@ async def test_discovery_notification(hass):
     await hass.async_block_till_done()
     state = hass.states.get('persistent_notification.config_entry_discovery')
     assert state is None
+
+
+async def test_discovery_notification_not_created(hass):
+    """Test that we not create a notification when discovery is aborted."""
+    loader.set_component(hass, 'test', MockModule('test'))
+    await async_setup_component(hass, 'persistent_notification', {})
+
+    class TestFlow(data_entry_flow.FlowHandler):
+        VERSION = 5
+
+        async def async_step_discovery(self, user_input=None):
+            return self.async_abort(reason='test')
+
+    with patch.dict(config_entries.HANDLERS, {'test': TestFlow}):
+        await hass.config_entries.flow.async_init(
+            'test', source=data_entry_flow.SOURCE_DISCOVERY)
+
+    await hass.async_block_till_done()
+    state = hass.states.get('persistent_notification.config_entry_discovery')
+    assert state is None
diff --git a/tests/test_data_entry_flow.py b/tests/test_data_entry_flow.py
index 6d3e41436c5..894fd4d7194 100644
--- a/tests/test_data_entry_flow.py
+++ b/tests/test_data_entry_flow.py
@@ -21,7 +21,8 @@ def manager():
         return handler()
 
     async def async_add_entry(result):
-        entries.append(result)
+        if (result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY):
+            entries.append(result)
 
     manager = data_entry_flow.FlowManager(
         None, async_create_flow, async_add_entry)