diff --git a/stream_django/templatetags/activity_tags.py b/stream_django/templatetags/activity_tags.py
index 1e11e54..2f7f107 100644
--- a/stream_django/templatetags/activity_tags.py
+++ b/stream_django/templatetags/activity_tags.py
@@ -1,3 +1,4 @@
+import django
 from django import template
 from django.template import Context, loader
 from stream_django.exceptions import MissingDataException
@@ -41,7 +42,10 @@ def render_activity(context, activity, template_prefix='', missing_data_policy=L
 
     tmpl = loader.get_template(template_name)
     context['activity'] = activity
-    context = Context(context)
+
+    if django.get_version() < 1.11:
+        context = Context(context)
+
     return tmpl.render(context)