diff --git a/plugins/linkit_plugins/linkit-plugin-entity.class.php b/plugins/linkit_plugins/linkit-plugin-entity.class.php
index e4fa6788c60a210dcc7ea3f3a3890c185940209e..c5349d079ed2bbcbc9d623c6c3d94f9c2c3da4ce 100644
--- a/plugins/linkit_plugins/linkit-plugin-entity.class.php
+++ b/plugins/linkit_plugins/linkit-plugin-entity.class.php
@@ -104,10 +104,7 @@ class LinkitPluginEntity extends LinkitPlugin {
   function buildDescription($data) {
     $description = token_replace(check_plain($this->conf['result_description']), array(
       $this->plugin['entity_type'] => $data,
-    ));
-
-    // Hide tokens that still haven't been replaced.
-    $description = preg_replace('/\[[^\s\[\]:]*:[^\s\[\]]*\]/x', '', $description);
+    ), array('clear' => TRUE));
     return $description;
   }
 
diff --git a/plugins/plugin.class.php b/plugins/plugin.class.php
index 30154b188428ca3e478c7cbf33153a0b9deeb2b9..e3479e17412f0c0249f542c3ec9102f1b74ce2ac 100644
--- a/plugins/plugin.class.php
+++ b/plugins/plugin.class.php
@@ -92,10 +92,7 @@ abstract class LinkitPlugin implements LinkitPluginInterface {
     if (isset($this->profile->data[$this->plugin['name']]['result_description'])) {
       $description =  token_replace(check_plain($this->profile->data[$this->plugin['name']]['result_description']), array(
         $this->plugin_name => $data,
-      ));
-
-      // Hide tokens that still haven't been replaced.
-      $description = preg_replace('/\[[^\s\[\]:]*:[^\s\[\]]*\]/x', '', $description);
+      ), array('clear' => TRUE));
       return $description;
     }
   }