diff --git a/search/bookmarks/processor.cpp b/search/bookmarks/processor.cpp
index 175c8973b6..deae87d0f5 100644
--- a/search/bookmarks/processor.cpp
+++ b/search/bookmarks/processor.cpp
@@ -129,23 +129,20 @@ void Processor::AddToIndex(Id const & id)
 
 void Processor::Update(Id const & id, Doc const & doc)
 {
+  auto group = kInvalidGroupId;
   auto const groupIt = m_idToGroup.find(id);
   if (groupIt != m_idToGroup.end())
   {
     // A copy to avoid use-after-free.
-    auto const group = groupIt->second;
+    group = groupIt->second;
     DetachFromGroup(id, group);
   }
 
   Erase(id);
   Add(id, doc);
 
-  if (groupIt != m_idToGroup.end())
-  {
-    // A copy to avoid use-after-free.
-    auto const group = groupIt->second;
+  if (group != kInvalidGroupId)
     AttachToGroup(id, group);
-  }
 }
 
 void Processor::Erase(Id const & id)