diff --git a/src/common/tags.h b/src/common/tags.h
index f6b19e59e..f901117b5 100644
--- a/src/common/tags.h
+++ b/src/common/tags.h
@@ -128,7 +128,15 @@ Tags::Remove (T &tag)
   // input to this function is not a subclass of the Tag class.
   parent = &tag;
   NS_ASSERT (sizeof (T) <= Tags::SIZE);
-  return Remove (T::GetUid ());
+  if (Peek (tag))
+    {
+      Remove (T::GetUid ());
+      return true;
+    }
+  else
+    {
+      return false;
+    }
 }
 
 template <typename T>