diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 56e5195c1..f31f4028c 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -32,10 +32,16 @@ class TagController extends Controller
             $em = $this->getDoctrine()->getManager();
 
             if (is_null($existingTag)) {
-                $entry->addTag($tag);
+                $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
+                    $entry,
+                    $tag
+                );
                 $em->persist($tag);
             } elseif (!$existingTag->hasEntry($entry)) {
-                $entry->addTag($existingTag);
+                $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
+                    $entry,
+                    $existingTag
+                );
                 $em->persist($existingTag);
             }