diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
index eddef1659e3..99825350132 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -154,7 +154,7 @@ class AnsibleContext(Context):
         '''
         if isinstance(val, dict):
             for key in val.keys():
-                if self._is_unsafe(val[key]):
+                if self._is_unsafe(key) or self._is_unsafe(val[key]):
                     return True
         elif isinstance(val, list):
             for item in val:
@@ -392,11 +392,11 @@ class Templar:
                             fail_on_undefined=fail_on_undefined,
                             overrides=overrides,
                         )
-                        if convert_data and not self._no_type_regex.match(variable):
+                        unsafe = hasattr(result, '__UNSAFE__')
+                        if convert_data and not self._no_type_regex.match(variable) and not unsafe:
                             # if this looks like a dictionary or list, convert it to such using the safe_eval method
                             if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \
                                 result.startswith("[") or result in ("True", "False"):
-                                unsafe = hasattr(result, '__UNSAFE__')
                                 eval_results = safe_eval(result, locals=self._available_variables, include_exceptions=True)
                                 if eval_results[1] is None:
                                     result = eval_results[0]
diff --git a/lib/ansible/vars/unsafe_proxy.py b/lib/ansible/vars/unsafe_proxy.py
index 211220d8a72..3923289520d 100644
--- a/lib/ansible/vars/unsafe_proxy.py
+++ b/lib/ansible/vars/unsafe_proxy.py
@@ -93,10 +93,14 @@ class AnsibleJSONUnsafeDecoder(json.JSONDecoder):
             return value
 
 def _wrap_dict(v):
+    # Create new dict to get rid of the keys that are not wrapped.
+    new = {}
     for k in v.keys():
         if v[k] is not None:
-            v[wrap_var(k)] = wrap_var(v[k])
-    return v
+            new[wrap_var(k)] = wrap_var(v[k])
+        else:
+            new[wrap_var(k)] = None
+    return new
 
 
 def _wrap_list(v):