diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index f80d4ab86..034e6073c 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -230,18 +230,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     public function addSocialAction(SocialAction $socialAction): self
     {
         $descendants = $socialAction->getDescendants();
-        $inCollection = false;
 
-        if(null != $descendants) {
+        if(count($descendants) > 0) {
             foreach ($descendants as $d) {
                 $inCollection = $this->socialActions->contains($d);
+                if ($inCollection) {
+                    return $this;
+                }
             }
         } else {
-            $inCollection = $this->socialActions->contains($socialAction);
-        }
-
-        if(!$inCollection) {
-            $this->socialActions[] = $socialAction;
+            if (!$this->socialActions->contains($socialAction)) {
+                $this->socialActions[] = $socialAction;
+            };
         }
 
         return $this;
@@ -250,18 +250,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
         $descendants = $socialIssue->getDescendants();
-        $inCollection = false;
 
-        if(null != $descendants) {
+        if(count($descendants) > 0) {
             foreach ($descendants as $d) {
                 $inCollection = $this->socialIssues->contains($d);
+                if ($inCollection) {
+                    return $this;
+                }
             }
         } else {
-            $inCollection = $this->socialIssues->contains($socialIssue);
-        }
-
-        if(!$inCollection) {
-            $this->socialIssues[] = $socialIssue;
+            if (!$this->socialIssues->contains($socialIssue)) {
+                $this->socialIssues[] = $socialIssue;
+            };
         }
 
         return $this;