diff --git a/src/olympia/addons/templates/addons/persona_preview.html b/src/olympia/addons/templates/addons/persona_preview.html
index 3f82021f88b5..286f4f1283de 100644
--- a/src/olympia/addons/templates/addons/persona_preview.html
+++ b/src/olympia/addons/templates/addons/persona_preview.html
@@ -1,3 +1,4 @@
+{% if persona is not None %}
 {% if size == 'large' %}
   <div class="persona persona-{{ size }}">
     <div class="persona-inner">
@@ -113,3 +114,4 @@ <h4>
     {% endif %}
   </div>
 {% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/src/olympia/addons/templatetags/jinja_helpers.py b/src/olympia/addons/templatetags/jinja_helpers.py
index 4d12578f33a9..6afdcc79df8e 100644
--- a/src/olympia/addons/templatetags/jinja_helpers.py
+++ b/src/olympia/addons/templatetags/jinja_helpers.py
@@ -236,6 +236,12 @@ def new_context(context, **kw):
 @jinja2.contextfunction
 def persona_preview(context, persona, size='large', linked=True, extra=None,
                     details=False, title=False, caption=False, url=None):
+    # Signal to the html that we don't want to render anything
+    if persona is None:
+        c = dict(context.items())
+        c.update({'persona': None})
+        return context.items()
+
     preview_map = {'large': persona.preview_url,
                    'small': persona.thumb_url}
     addon = persona.addon
diff --git a/src/olympia/users/templates/users/profile.html b/src/olympia/users/templates/users/profile.html
index 42ba275b748d..4ec8bde34467 100644
--- a/src/olympia/users/templates/users/profile.html
+++ b/src/olympia/users/templates/users/profile.html
@@ -63,19 +63,6 @@ <h2>{{ _("Add-ons I've created") }}</h2>
   </div>
 {% endif %}
 
-{% if personas %}
-  <div id="my-themes" class="island c">
-    <a href="{{ profile.get_themes_url_path() }}" class="button view-all">
-      {{ _('View all') }}</a>
-    {% if limited_personas %}
-      <h2>{{ _("My Most Popular Themes") }}</h2>
-    {% else %}
-      <h2>{{ _("Themes I've created") }}</h2>
-    {% endif %}
-    {{ personas|impala_persona_grid(cols=5, pagesize=THEMES_LIMIT) }}
-  </div>
-{% endif %}
-
 {% if own_coll or fav_coll %}
 <aside class="secondary" id="my-collections">
   <div class="island">