diff --git a/source/_docs/automation/trigger.markdown b/source/_docs/automation/trigger.markdown
index 34fb20fbbd5..6554d15ea95 100644
--- a/source/_docs/automation/trigger.markdown
+++ b/source/_docs/automation/trigger.markdown
@@ -85,7 +85,7 @@ automation:
 
 ## Event trigger
 
-Fires when an {% term event %} is being received. Events are the raw building blocks of Home Assistant. You can match events on just the event name or also require specific event data or context to be present.
+An event trigger fires when an [event](/docs/configuration/events/) is being received. Events are the raw building blocks of Home Assistant. You can match events on just the event name or also require specific event data or context to be present.
 
 Events can be fired by integrations or via the API. There is no limitation to the types. A list of built-in events can be found [here](/docs/configuration/events/).
 
diff --git a/source/_docs/configuration/events.markdown b/source/_docs/configuration/events.markdown
index 01d5cbce076..44dea4de524 100644
--- a/source/_docs/configuration/events.markdown
+++ b/source/_docs/configuration/events.markdown
@@ -8,11 +8,13 @@ related:
     title: Event integration
 ---
 
-The core of Home Assistant is the event bus. The event bus allows any integration to fire or listen for events. It is the core of everything.
+The core of Home Assistant is the event bus. The event bus allows any integration to fire or listen for events.
 
-For example, any state change will be announced on the event bus as a `state_changed` event containing the previous and the new state of an entity.
+## Events and state changes
 
-Home Assistant contains a few built-in events that are used to coordinate between various integrations.
+All {% term entities %} produce state change events. Every time a {% term state %} changes, a state change event is produced. State change events are just one type of event on the event bus, but there are other kinds of events, such as the [built-in events](#built-in-events-core) that are used to coordinate between various integrations. State change events are not to be confused with the [event entity](/integrations/event/). This is a specific type of entity, that itself produces event state changes, just like all other entities.
+
+Any state change will be announced on the event bus as a `state_changed` event, containing the previous and the new state of an entity.
 
 ## Common fields
 
diff --git a/source/_integrations/event.markdown b/source/_integrations/event.markdown
index eaa4f6d0c5e..4ff64a38546 100644
--- a/source/_integrations/event.markdown
+++ b/source/_integrations/event.markdown
@@ -20,6 +20,8 @@ related:
 
 Events are signals that are emitted when something happens, for example, when a user presses a physical button like a doorbell or when a button on a remote control is pressed.
 
+The **Event** {% term integration %} provides {% term entities %} that trigger state change events, as do all other entity integrations.
+
 These events do not capture a state in the traditional sense. For example, a doorbell does not have a state such as "on" or "off" but instead is momentarily pressed. Some events can have variations in the type of event that is emitted. For example, maybe your remote control is capable of emitting a single press, a double press, or a long press.
 
 The event entity can capture these events in the physical world and makes them available in Home Assistant as an entity.