diff --git a/auth/lib/ui/home_page.dart b/auth/lib/ui/home_page.dart
index 640de323a..a51ea9792 100644
--- a/auth/lib/ui/home_page.dart
+++ b/auth/lib/ui/home_page.dart
@@ -316,6 +316,12 @@ class _HomePageState extends State<HomePage> {
                         ? TagChipState.selected
                         : TagChipState.unselected,
                     onTap: () {
+                      if (selectedTag == _codes!.tags[index - 1]) {
+                        selectedTag = "";
+                        setState(() {});
+                        _applyFilteringAndRefresh();
+                        return;
+                      }
                       selectedTag = _codes!.tags[index - 1];
                       setState(() {});
                       _applyFilteringAndRefresh();