diff --git a/lib/redis/rediswriter.cpp b/lib/redis/rediswriter.cpp
index a04b53cb3..39124d15c 100644
--- a/lib/redis/rediswriter.cpp
+++ b/lib/redis/rediswriter.cpp
@@ -244,6 +244,21 @@ void RedisWriter::HandleEvent(const Dictionary::Ptr& event)
 	if (!m_Context)
 		return;
 
+	String type = event->Get("type");
+	bool atLeastOneSubscriber = false;
+
+	for (const std::pair<String, RedisSubscriptionInfo>& kv : m_Subscriptions) {
+		const auto& rsi = kv.second;
+
+		if (rsi.EventTypes.find(type) == rsi.EventTypes.end())
+			continue;
+
+		atLeastOneSubscriber = true;
+	}
+
+	if (!atLeastOneSubscriber)
+		return;
+
 	Log(LogInformation, "RedisWriter")
 	    << "Pushing event to Redis: '" << Value(event) << "'.";
 
@@ -318,8 +333,6 @@ void RedisWriter::HandleEvent(const Dictionary::Ptr& event)
 
 	freeReplyObject(reply3);
 
-	String type = event->Get("type");
-
 	for (const std::pair<String, RedisSubscriptionInfo>& kv : m_Subscriptions) {
 		const auto& name = kv.first;
 		const auto& rsi = kv.second;