diff --git a/source/_docs/configuration/templating.markdown b/source/_docs/configuration/templating.markdown
index 86a8b5fe6e5..f0e99b2406b 100644
--- a/source/_docs/configuration/templating.markdown
+++ b/source/_docs/configuration/templating.markdown
@@ -106,6 +106,10 @@ Extensions allow templates to access all of the Home Assistant specific states a
 
 Templates for some [triggers](/docs/automation/trigger/) as well as `trigger_variables` only support a subset of the Home Assistant template extensions. This subset is referred to as "Limited Templates".
 
+### This
+
+State-based and trigger-based template entities have the special template variable `this` available in their templates and actions. See more details and examples in the [Template integration documentation](/integrations/template).
+
 ### States
 
 Not supported in [limited templates](#limited-templates).
diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index 4a3fdf24c5c..e4e44fbb1f2 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -441,7 +441,11 @@ This video tutorial explains how to set up a Trigger based template that makes u
 
 ### Template and action variables
 
-State-based and trigger-based template entities have the special template variable `this` available in their templates and actions. The `this` variable is the [state object](/docs/configuration/state_object) of the entity and aids [self-referencing](#self-referencing) of an entity's state and attribute in templates and actions. Trigger-based entities also provide [the trigger data](/docs/automation/templating/). 
+State-based and trigger-based template entities have the special template variable `this` available in their templates and actions. The `this` variable is the current [state object](/docs/configuration/state_object) of the entity and aids [self-referencing](#self-referencing) of an entity's state and attribute in templates and actions. Trigger-based entities also provide [the trigger data](/docs/automation/templating/).
+
+{% note %}
+Self-referecing using `this` provides the current state for the entity. To access the new state, use the `value` variable.
+{% endnote %}
 
 ### Rate limiting updates