diff --git a/django/template/base.py b/django/template/base.py
index 99f30ff32d..c48746bbef 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -1012,8 +1012,7 @@ def render_value_in_context(value, context):
     value = template_localtime(value, use_tz=context.use_tz)
     value = localize(value, use_l10n=context.use_l10n)
     value = force_text(value)
-    if ((context.autoescape and not isinstance(value, SafeData)) or
-            isinstance(value, EscapeData)):
+    if context.autoescape or isinstance(value, EscapeData):
         return conditional_escape(value)
     else:
         return value