diff --git a/resources/custom_modules/mediaplayer.py b/resources/custom_modules/mediaplayer.py
index f6171b13..d9caacd7 100755
--- a/resources/custom_modules/mediaplayer.py
+++ b/resources/custom_modules/mediaplayer.py
@@ -39,7 +39,7 @@ def on_metadata(player, metadata, manager):
         track_info = '{artist} - {title}'.format(artist=player.get_artist(),
                                                  title=player.get_title())
 
-    if player.props.status != 'Playing':
+    if player.props.status != 'Playing' and track_info:
         track_info = ' ' + track_info
     write_output(track_info, player)
 
diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index a2294e5e..f134f980 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -123,8 +123,11 @@ auto waybar::modules::Custom::update() -> void {
     for (auto const& c : class_) {
       label_.get_style_context()->add_class(c);
     }
-
-    event_box_.show();
+    if (text_.empty()) {
+      event_box_.hide();
+    } else {
+      event_box_.show();
+    }
   }
 }