diff --git a/apps/user/models.py b/apps/user/models.py
index 058df6b6..988ec5ee 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -110,7 +110,9 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs):
 
 @receiver(post_save, sender=User)
 def auto_create_subscription(sender, instance=None, created=False, **kwargs):
-    if not hasattr(instance, 'email_subscription'):
+    try:
+        es = EmailSubscription.objects.get(email=instance.email)
+    except EmailSubscription.DoesNotExist:
         instance.email_subscription = EmailSubscription.objects.create(
             user=instance,
             email=instance.email,