diff --git a/models/res_partner.py b/models/res_partner.py
index 7ea6c67595937e815c642c395c7d4246e9d2de66..135d3b8f2d7bec0697a3c5dc2ecae857cfdcd683 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -684,12 +684,13 @@ class ScopPartner(models.Model):
             else:
                 partner.membership_status = "not_member"
 
-    @api.depends('questionnaire_ids')
+    @api.depends('questionnaire_ids', 'questionnaire_ids.staff_count',
+                 'questionnaire_ids.effective_date')
     @api.multi
     def _compute_last_effective(self):
         for partner in self:
-            lm = partner.questionnaire_ids.search([
-                ['partner_id', '=', partner.id]],
+            lm = partner.questionnaire_ids.search(
+                [['partner_id', '=', partner.id], ['staff_count', 'gt', 0]],
                 limit=1,
                 order='effective_date desc')
             if lm: