diff --git a/app/views/admin/announcements/_feed.html.erb b/app/views/admin/announcements/_feed.html.erb
index 5c92dcd..f55d48d 100644
--- a/app/views/admin/announcements/_feed.html.erb
+++ b/app/views/admin/announcements/_feed.html.erb
@@ -14,19 +14,30 @@
     <div class="tags">
           <div id="tags-list">
             <ul class="tags-groups checkbox-card module-tags">
+            <% tags_to_remove = [] %>
               <% feed.tag_ids.each do |t| %>
-                <% tag = Tag.find(t) %>
-                <li class="filter-item module">
-                      <a href="#" onclick="return false;">
-                    <% @site_in_use_locales.each_with_index do |locale,index| %>
-                        <span class="tag"><%= tag.name_translations[locale] %></span> 
-                        <% if index < (@site_in_use_locales.count - 1) %>
-                        / 
-                        <% end %>
-                    <% end %>
-                    </a>
-                </li>
+                <% tag = Tag.find(t) rescue nil %>
+                <% if !tag.nil? %>
+                  <li class="filter-item module">
+                        <a href="#" onclick="return false;">
+                      <% @site_in_use_locales.each_with_index do |locale,index| %>
+                          <span class="tag"><%= tag.name_translations[locale] %></span> 
+                          <% if index < (@site_in_use_locales.count - 1) %>
+                          / 
+                          <% end %>
+                      <% end %>
+                      </a>
+                  </li>
+                <% else %>
+                  <% tags_to_remove << t %>
+                <% end %>
               <% end %>
+              <% if !tags_to_remove.blank? 
+                tags_to_remove.each do |t|
+                  feed.tag_ids.delete(t)
+                end
+                feed.save
+              end %>
             </ul>
           </div>
       </div>