diff --git a/tools/clip/application.cc b/tools/clip/application.cc
index 9a655bcdbd..988a64bff3 100644
--- a/tools/clip/application.cc
+++ b/tools/clip/application.cc
@@ -8,9 +8,12 @@
 #include "recorder/widget.h"
 
 Application::Application(int argc, char *argv[], QObject *parent) : QObject(parent) {
-  initApp(argc, argv);
+  argc_ = argc;
+  argv_ = argv;
 
-  app = new QApplication(argc, argv);
+  initApp(argc_, argv_);
+
+  app = new QApplication(argc_, argv_);
 
   QCommandLineParser parser;
   parser.setApplicationDescription("Clip your ride!");
diff --git a/tools/clip/application.h b/tools/clip/application.h
index 74a28a4e84..578ce8a39c 100644
--- a/tools/clip/application.h
+++ b/tools/clip/application.h
@@ -27,4 +27,7 @@ private:
     std::unique_ptr<Replay> replay;
     QThread *replayThread = nullptr;
     bool replayRunning = false;
+
+    int argc_;
+    char **argv_;
 };
diff --git a/tools/replay/replay.cc b/tools/replay/replay.cc
index 0a7ca8910e..618d3cc958 100644
--- a/tools/replay/replay.cc
+++ b/tools/replay/replay.cc
@@ -215,6 +215,8 @@ void Replay::startStream(const std::shared_ptr<Segment> segment) {
 }
 
 void Replay::publishMessage(const Event *e) {
+  if (event_filter_ && event_filter_(e)) return;
+
   if (!sm_) {
     auto bytes = e->data.asBytes();
     int ret = pm_->send(sockets_[e->which], (capnp::byte *)bytes.begin(), bytes.size());