diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 18960992d0e..f9d3da88868 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -257,7 +257,7 @@ class MailThread(models.AbstractModel):
 
         threads = super(MailThread, self).create(vals_list)
         # subscribe uid unless asked not to
-        if not self._context.get('mail_create_nosubscribe') and threads:
+        if not self._context.get('mail_create_nosubscribe') and threads and self.env.user.active:
             self.env['mail.followers']._insert_followers(
                 threads._name, threads.ids,
                 self.env.user.partner_id.ids, subtypes=None,
diff --git a/addons/test_mail/tests/test_mail_followers.py b/addons/test_mail/tests/test_mail_followers.py
index 5670869f928..dfedff9d386 100644
--- a/addons/test_mail/tests/test_mail_followers.py
+++ b/addons/test_mail/tests/test_mail_followers.py
@@ -325,8 +325,8 @@ class AdvancedFollowersTest(TestMailCommon):
         })
         self.assertFalse(new_record.message_partner_ids,
                          'Filters out inactive partners')
-        self.assertEqual(new_record.message_follower_ids.partner_id, self.partner_admin,
-                         'TODO: should not subscribe inactive partner')
+        self.assertFalse(new_record.message_follower_ids.partner_id,
+                         'Does not subscribe inactive partner')
 
     def test_auto_subscribe_post(self):
         """ People posting a message are automatically added as followers """