diff --git a/src/rviz/message_filter_display.h b/src/rviz/message_filter_display.h
index d71ddbff06..6ced86dd18 100644
--- a/src/rviz/message_filter_display.h
+++ b/src/rviz/message_filter_display.h
@@ -180,7 +180,7 @@ class MessageFilterDisplay : public _RosTopicDisplay
    * processMessage(). */
   void incomingMessage(const typename MessageType::ConstPtr& msg)
   {
-    if (!msg)
+    if (!msg || !isEnabled())
     {
       return;
     }