diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd
index 5669456a..64621229 100644
--- a/man/waybar-river-tags.5.scd
+++ b/man/waybar-river-tags.5.scd
@@ -31,6 +31,11 @@ Addressed by *river/tags*
 	default: false ++
 	Enables this module to consume all left over space dynamically.
 
+*hide-vacant*: ++
+	typeof: bool ++
+	default: false ++
+	Only show relevant tags: tags that are either focused or have a window on them.
+
 # EXAMPLE
 
 ```
diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp
index 9e7cd5aa..26c8e3ad 100644
--- a/src/modules/river/tags.cpp
+++ b/src/modules/river/tags.cpp
@@ -189,11 +189,18 @@ bool Tags::handle_button_press(GdkEventButton *event_button, uint32_t tag) {
 }
 
 void Tags::handle_focused_tags(uint32_t tags) {
+  auto hide_vacant = config_["hide-vacant"].asBool();
   for (size_t i = 0; i < buttons_.size(); ++i) {
     if ((1 << i) & tags) {
+      if (hide_vacant) {
+        buttons_[i].set_visible(true);
+      }
       buttons_[i].get_style_context()->add_class("focused");
     } else {
       buttons_[i].get_style_context()->remove_class("focused");
+      if (hide_vacant && !buttons_[i].get_style_context()->has_class("occupied")) {
+        buttons_[i].set_visible(false);
+      }
     }
   }
 }
@@ -205,10 +212,17 @@ void Tags::handle_view_tags(struct wl_array *view_tags) {
   for (; view_tag < end; ++view_tag) {
     tags |= *view_tag;
   }
+  auto hide_vacant = config_["hide-vacant"].asBool();
   for (size_t i = 0; i < buttons_.size(); ++i) {
     if ((1 << i) & tags) {
+      if (hide_vacant) {
+        buttons_[i].set_visible(true);
+      }
       buttons_[i].get_style_context()->add_class("occupied");
     } else {
+      if (hide_vacant) {
+        buttons_[i].set_visible(false);
+      }
       buttons_[i].get_style_context()->remove_class("occupied");
     }
   }