diff --git a/src/macro-external/twitch/CMakeLists.txt b/src/macro-external/twitch/CMakeLists.txt
index cbed769d..16dcb554 100644
--- a/src/macro-external/twitch/CMakeLists.txt
+++ b/src/macro-external/twitch/CMakeLists.txt
@@ -27,7 +27,8 @@ find_package(ZLIB)
 # --- End of section ---
 
 add_library(${PROJECT_NAME} MODULE)
-target_compile_definitions(${PROJECT_NAME} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT=1)
+target_compile_definitions(${PROJECT_NAME} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT=1
+                                                   ASIO_HAS_OPENSSSL=1)
 if(OS_MACOS)
   target_compile_definitions(
     ${PROJECT_NAME} PRIVATE CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN=1)
@@ -41,6 +42,8 @@ target_sources(
           category-selection.hpp
           channel-selection.cpp
           channel-selection.hpp
+          event-sub.cpp
+          event-sub.hpp
           macro-action-twitch.cpp
           macro-action-twitch.hpp
           token.cpp
diff --git a/src/macro-external/twitch/event-sub.cpp b/src/macro-external/twitch/event-sub.cpp
new file mode 100644
index 00000000..42c25dc1
--- /dev/null
+++ b/src/macro-external/twitch/event-sub.cpp
@@ -0,0 +1,439 @@
+#include "event-sub.hpp"
+#include "token.hpp"
+#include "twitch-helpers.hpp"
+
+#include <log-helper.hpp>
+#include <switcher-data.hpp>
+
+namespace advss {
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+#ifdef USE_TWITCH_CLI_MOCK
+constexpr std::string_view defaultURL = "ws://127.0.0.1:8080/ws";
+constexpr std::string_view registerSubscriptionURL = "http://127.0.0.1:8080";
+constexpr std::string_view registerSubscriptionPath = "/eventsub/subscriptions";
+#else
+constexpr std::string_view defaultURL = "wss://eventsub.wss.twitch.tv/ws";
+constexpr std::string_view registerSubscriptionURL = "https://api.twitch.tv";
+constexpr std::string_view registerSubscriptionPath =
+	"/helix/eventsub/subscriptions";
+#endif
+const int reconnectDelay = 15;
+const int messageIDBufferSize = 20;
+
+EventSub::EventSub() : QObject(nullptr)
+{
+	_client.get_alog().clear_channels(
+		websocketpp::log::alevel::frame_header |
+		websocketpp::log::alevel::frame_payload |
+		websocketpp::log::alevel::control);
+	_client.init_asio();
+#ifndef _WIN32
+	_client.set_reuse_addr(true);
+#endif
+
+	_client.set_open_handler(bind(&EventSub::OnOpen, this, _1));
+	_client.set_message_handler(bind(&EventSub::OnMessage, this, _1, _2));
+	_client.set_close_handler(bind(&EventSub::OnClose, this, _1));
+	_client.set_fail_handler(bind(&EventSub::OnFail, this, _1));
+
+#ifndef USE_TWITCH_CLI_MOCK
+	_client.set_tls_init_handler([](websocketpp::connection_hdl) {
+		return websocketpp::lib::make_shared<asio::ssl::context>(
+			asio::ssl::context::sslv23_client);
+	});
+#endif
+	_url = defaultURL.data();
+	RegisterInstance();
+}
+
+EventSub::~EventSub()
+{
+	Disconnect();
+	UnregisterInstance();
+}
+
+static bool setupEventSubMessageClear()
+{
+	GetSwitcher()->AddIntervalResetStep(&EventSub::ClearAllEvents);
+	return true;
+}
+
+bool EventSub::_setupDone = setupEventSubMessageClear();
+
+void EventSub::ClearEvents()
+{
+	std::lock_guard<std::mutex> lock(_messageMtx);
+	_messages.clear();
+}
+
+std::mutex EventSub::_instancesMtx;
+std::vector<EventSub *> EventSub::_instances;
+
+void EventSub::RegisterInstance()
+{
+	std::lock_guard<std::mutex> lock(_instancesMtx);
+	_instances.emplace_back(this);
+}
+
+void EventSub::UnregisterInstance()
+{
+	std::lock_guard<std::mutex> lock(_instancesMtx);
+	auto it = std::remove(_instances.begin(), _instances.end(), this);
+	_instances.erase(it, _instances.end());
+}
+
+void EventSub::ClearAllEvents()
+{
+	std::lock_guard<std::mutex> lock(_instancesMtx);
+	for (const auto &eventSub : _instances) {
+		eventSub->ClearEvents();
+	}
+}
+
+void EventSub::ConnectThread()
+{
+	while (!_disconnect) {
+		std::unique_lock<std::mutex> lock(_waitMtx);
+		_client.reset();
+		_connected = true;
+		websocketpp::lib::error_code ec;
+		EventSubWSClient::connection_ptr con =
+			_client.get_connection(_url, ec);
+		if (ec) {
+			blog(LOG_INFO, "Twitch EventSub failed: %s",
+			     ec.message().c_str());
+		} else {
+			_client.connect(con);
+			_connection = connection_hdl(con);
+			_client.run();
+		}
+
+		blog(LOG_INFO,
+		     "Twitch EventSub trying to reconnect to in %d seconds.",
+		     reconnectDelay);
+		_cv.wait_for(lock, std::chrono::seconds(reconnectDelay));
+	}
+	_connected = false;
+}
+
+void EventSub::Connect()
+{
+	std::lock_guard<std::mutex> lock(_connectMtx);
+	if (_connected) {
+		vblog(LOG_INFO, "Twitch EventSub connect already in progress");
+		return;
+	}
+	_disconnect = true;
+	if (_thread.joinable()) {
+		_thread.join();
+	}
+	_disconnect = false;
+	_thread = std::thread(&EventSub::ConnectThread, this);
+}
+
+void EventSub::ClearActiveSubscriptions()
+{
+	std::lock_guard<std::mutex> lock(_subscriptionMtx);
+	_activeSubscriptions.clear();
+}
+
+void EventSub::Disconnect()
+{
+	std::lock_guard<std::mutex> lock(_connectMtx);
+	_disconnect = true;
+	websocketpp::lib::error_code ec;
+	_client.close(_connection, websocketpp::close::status::normal,
+		      "Twitch EventSub stopping", ec);
+	{
+		std::unique_lock<std::mutex> waitLock(_waitMtx);
+		_cv.notify_all();
+	}
+
+	while (_connected) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		_client.close(_connection, websocketpp::close::status::normal,
+			      "Twitch EventSub stopping", ec);
+	}
+
+	if (_thread.joinable()) {
+		_thread.join();
+	}
+	_connected = false;
+	ClearActiveSubscriptions();
+}
+
+std::vector<Event> EventSub::Events()
+{
+	std::lock_guard<std::mutex> lock(_messageMtx);
+	return _messages;
+}
+
+bool EventSub::SubscriptionIsActive(const std::string &id)
+{
+	std::lock_guard<std::mutex> lock(_subscriptionMtx);
+	for (const auto &subscription : _activeSubscriptions) {
+		if (subscription.id == id) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool isAlreadySubscribed(const std::set<Subscription> &subscriptions,
+				const Subscription &newSubsciption)
+{
+	return subscriptions.find(newSubsciption) != subscriptions.end();
+}
+
+static void setTransportData(const OBSData &data, const std::string &sessionID)
+{
+	OBSDataAutoRelease transport = obs_data_create();
+	obs_data_set_string(transport, "method", "websocket");
+	obs_data_set_string(transport, "session_id", sessionID.c_str());
+	obs_data_set_obj(data, "transport", transport);
+}
+
+static obs_data_t *copyData(const OBSData &data)
+{
+	auto json = obs_data_get_json(data);
+	if (!json) {
+		return nullptr;
+	}
+	return obs_data_create_from_json(json);
+}
+
+std::string EventSub::AddEventSubscribtion(std::shared_ptr<TwitchToken> token,
+					   Subscription subscription)
+{
+	auto eventSub = token->GetEventSub();
+	if (!eventSub) {
+		blog(LOG_WARNING, "failed to get Twitch EventSub from token!");
+		return "";
+	}
+
+	std::lock_guard<std::mutex> lock(eventSub->_subscriptionMtx);
+	if (!eventSub->_connected) {
+		std::thread t([eventSub]() { eventSub->Connect(); });
+		t.detach();
+		vblog(LOG_INFO, "Twitch EventSub connect started for %s",
+		      token->GetName().c_str());
+		return "";
+	}
+
+	if (isAlreadySubscribed(eventSub->_activeSubscriptions, subscription)) {
+		return eventSub->_activeSubscriptions.find(subscription)->id;
+	}
+
+	OBSDataAutoRelease postData = copyData(subscription.data);
+	setTransportData(postData.Get(), eventSub->_sessionID);
+	auto result = SendPostRequest(registerSubscriptionURL.data(),
+				      registerSubscriptionPath.data(), *token,
+				      postData.Get());
+	if (result.status != 202) {
+		vblog(LOG_INFO, "failed to register Twitch EventSub (%d)",
+		      result.status);
+		return "";
+	}
+	OBSDataArrayAutoRelease replyArray =
+		obs_data_get_array(result.data, "data");
+	OBSDataAutoRelease replyData = obs_data_array_item(replyArray, 0);
+	subscription.id = obs_data_get_string(replyData, "id");
+	eventSub->_activeSubscriptions.emplace(subscription);
+	return subscription.id;
+}
+
+void EventSub::OnOpen(connection_hdl)
+{
+	vblog(LOG_INFO, "Twitch EventSub connection opened");
+	_connected = true;
+}
+
+static bool isValidTimestamp(const std::string &timestamp)
+{
+	std::tm tm = {};
+	std::istringstream ss(timestamp);
+	ss >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S.%fZ");
+	auto tp = std::chrono::system_clock::from_time_t(std::mktime(&tm));
+	tp += std::chrono::hours(1); // UTC
+	std::chrono::system_clock::time_point currentTime =
+		std::chrono::system_clock::now();
+	auto diff = currentTime - tp;
+	return diff <= std::chrono::minutes(10);
+}
+
+bool EventSub::IsValidMessageID(const std::string &id)
+{
+	auto it = std::find(_messageIDs.begin(), _messageIDs.end(), id);
+	if (it != _messageIDs.end()) {
+		return false;
+	}
+	if (!_messageIDs.empty()) {
+		_messageIDs.pop_front();
+	}
+	_messageIDs.push_back(id);
+	return true;
+}
+
+bool EventSub::IsValidID(const std::string &id)
+{
+	return !_sessionID.empty() && id == _sessionID;
+}
+
+void EventSub::OnMessage(connection_hdl, EventSubWSClient::message_ptr message)
+{
+	if (!message) {
+		return;
+	}
+	if (message->get_opcode() != websocketpp::frame::opcode::text) {
+		return;
+	}
+
+	std::string payload = message->get_payload();
+	OBSDataAutoRelease json = obs_data_create_from_json(payload.c_str());
+	if (!json) {
+		blog(LOG_ERROR, "invalid JSON payload received for '%s'",
+		     payload.c_str());
+		return;
+	}
+
+	OBSDataAutoRelease metadata = obs_data_get_obj(json, "metadata");
+	std::string timestamp =
+		obs_data_get_string(metadata, "message_timestamp");
+	if (!isValidTimestamp(timestamp)) {
+		blog(LOG_WARNING,
+		     "Discarding Twitch EventSub with invalid timestamp");
+		return;
+	}
+	std::string id = obs_data_get_string(metadata, "message_id");
+	if (!IsValidMessageID(id)) {
+		blog(LOG_WARNING,
+		     "Discarding Twitch EventSub with invalid message_id");
+		return;
+	}
+	std::string messageType = obs_data_get_string(metadata, "message_type");
+	OBSDataAutoRelease payloadJson = obs_data_get_obj(json, "payload");
+	if (messageType == "session_welcome") {
+		HandleWelcome(payloadJson);
+	} else if (messageType == "session_keepalive") {
+		HandleKeepAlive();
+	} else if (messageType == "notification") {
+		HandleNotification(payloadJson);
+	} else if (messageType == "session_reconnect") {
+		HandleReconnect(payloadJson);
+	} else if (messageType == "revocation") {
+		HanldeRevocation(payloadJson);
+	} else {
+		vblog(LOG_INFO, "ignoring message of unknown type '%s'",
+		      messageType.c_str());
+	}
+}
+
+void EventSub::HandleWelcome(obs_data_t *data)
+{
+	OBSDataAutoRelease session = obs_data_get_obj(data, "session");
+	_sessionID = obs_data_get_string(session, "id");
+	blog(LOG_INFO, "Twitch EventSub connected");
+}
+
+void EventSub::HandleKeepAlive() const
+{
+	// Nothing to do
+}
+
+void EventSub::HandleNotification(obs_data_t *data)
+{
+	Event event;
+	OBSDataAutoRelease subscription =
+		obs_data_get_obj(data, "subscription");
+	event.id = obs_data_get_string(subscription, "id");
+	event.type = obs_data_get_string(subscription, "type");
+	OBSDataAutoRelease eventData = obs_data_get_obj(data, "event");
+	event.data = eventData;
+	std::lock_guard<std::mutex> lock(_messageMtx);
+	_messages.emplace_back(event);
+}
+
+void EventSub::HandleReconnect(obs_data_t *data)
+{
+	OBSDataAutoRelease session = obs_data_get_obj(data, "session");
+	auto id = obs_data_get_string(session, "id");
+	if (!IsValidID(id)) {
+		vblog(LOG_INFO,
+		      "ignoring Twitch EventSub reconnect message with invalid id");
+		return;
+	}
+	_url = obs_data_get_string(session, "reconnect_url");
+	websocketpp::lib::error_code ec;
+	_client.close(_connection, websocketpp::close::status::normal,
+		      "Twitch EventSub reconnecting", ec);
+}
+
+void EventSub::HanldeRevocation(obs_data_t *data)
+{
+	OBSDataAutoRelease subscription =
+		obs_data_get_obj(data, "subscription");
+	auto id = obs_data_get_string(subscription, "id");
+	auto status = obs_data_get_string(subscription, "status");
+	auto type = obs_data_get_string(subscription, "type");
+	auto version = obs_data_get_string(subscription, "version");
+	OBSDataAutoRelease condition =
+		obs_data_get_obj(subscription, "condition");
+	auto conditionJson = obs_data_get_json(condition);
+	blog(LOG_INFO,
+	     "Twitch EventSub revoked:\n"
+	     "id: %s\n"
+	     "status: %s\n"
+	     "type: %s\n"
+	     "version: %s\n"
+	     "condition: %s\n",
+	     id, status, type, version, conditionJson ? conditionJson : "");
+
+	std::lock_guard<std::mutex> lock(_subscriptionMtx);
+	for (auto it = _activeSubscriptions.begin();
+	     it != _activeSubscriptions.begin();) {
+		if (it->id == id) {
+			it = _activeSubscriptions.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+void EventSub::OnClose(connection_hdl hdl)
+{
+	EventSubWSClient::connection_ptr con = _client.get_con_from_hdl(hdl);
+	auto msg = con->get_ec().message();
+	blog(LOG_INFO, "Twitch EventSub connection closed: %s", msg.c_str());
+	ClearActiveSubscriptions();
+	_connected = false;
+}
+
+void EventSub::OnFail(connection_hdl hdl)
+{
+	EventSubWSClient::connection_ptr con = _client.get_con_from_hdl(hdl);
+	auto msg = con->get_ec().message();
+	blog(LOG_INFO, "Twitch EventSub connection failed: %s", msg.c_str());
+	ClearActiveSubscriptions();
+	_connected = false;
+}
+
+bool Subscription::operator<(const Subscription &other) const
+{
+	auto json = obs_data_get_json(data);
+	std::string jsonString = json ? json : "";
+	auto otherJson = obs_data_get_json(other.data);
+	std::string otherJsonString = otherJson ? otherJson : "";
+	return jsonString < otherJsonString;
+}
+
+std::string Event::ToString() const
+{
+	auto json = obs_data_get_json(data);
+	return json ? json : "";
+}
+
+} // namespace advss
diff --git a/src/macro-external/twitch/event-sub.hpp b/src/macro-external/twitch/event-sub.hpp
new file mode 100644
index 00000000..6ba8d602
--- /dev/null
+++ b/src/macro-external/twitch/event-sub.hpp
@@ -0,0 +1,100 @@
+#pragma once
+#include <obs.hpp>
+#include <websocketpp/client.hpp>
+#include <QObject>
+#include <mutex>
+#include <condition_variable>
+#include <set>
+
+#ifdef USE_TWITCH_CLI_MOCK
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/config/asio_no_tls.hpp>
+#else
+#include <websocketpp/config/asio_client.hpp>
+#include <websocketpp/config/asio.hpp>
+#endif
+
+namespace advss {
+
+#ifdef USE_TWITCH_CLI_MOCK
+typedef websocketpp::client<websocketpp::config::asio_client> EventSubWSClient;
+#else
+typedef websocketpp::client<websocketpp::config::asio_tls_client>
+	EventSubWSClient;
+#endif
+
+using websocketpp::connection_hdl;
+class TwitchToken;
+
+struct Event {
+	std::string id;
+	std::string type;
+	OBSData data;
+
+	std::string ToString() const;
+};
+
+struct Subscription {
+	OBSData data;
+	std::string id;
+	bool operator<(const Subscription &) const;
+};
+
+class EventSub : public QObject {
+public:
+	explicit EventSub();
+	virtual ~EventSub();
+
+	void Connect();
+	void Disconnect();
+	std::vector<Event> Events();
+	bool SubscriptionIsActive(const std::string &id);
+	static std::string AddEventSubscribtion(std::shared_ptr<TwitchToken>,
+						Subscription);
+	static void ClearAllEvents();
+	void ClearActiveSubscriptions();
+
+private:
+	void OnOpen(connection_hdl hdl);
+	void OnMessage(connection_hdl hdl,
+		       EventSubWSClient::message_ptr message);
+	void OnClose(connection_hdl hdl);
+	void OnFail(connection_hdl hdl);
+	void ConnectThread();
+
+	bool IsValidMessageID(const std::string &);
+	bool IsValidID(const std::string &);
+
+	void HandleWelcome(obs_data_t *);
+	void HandleKeepAlive() const;
+	void HandleNotification(obs_data_t *);
+	void HandleReconnect(obs_data_t *);
+	void HanldeRevocation(obs_data_t *);
+
+	void ClearEvents();
+
+	void RegisterInstance();
+	void UnregisterInstance();
+
+	EventSubWSClient _client;
+	connection_hdl _connection;
+	std::thread _thread;
+	std::mutex _waitMtx;
+	std::mutex _connectMtx;
+	std::condition_variable _cv;
+	std::atomic_bool _connected{false};
+	std::atomic_bool _disconnect{false};
+	std::string _url;
+	std::string _sessionID;
+
+	std::mutex _messageMtx;
+	std::vector<Event> _messages;
+	std::deque<std::string> _messageIDs;
+	std::mutex _subscriptionMtx;
+	std::set<Subscription> _activeSubscriptions;
+	static std::mutex _instancesMtx;
+	static std::vector<EventSub *> _instances;
+	static bool _setupDone;
+};
+
+} // namespace advss
diff --git a/src/macro-external/twitch/token.cpp b/src/macro-external/twitch/token.cpp
index c50d474b..05f824bd 100644
--- a/src/macro-external/twitch/token.cpp
+++ b/src/macro-external/twitch/token.cpp
@@ -148,6 +148,14 @@ void TwitchToken::SetToken(const std::string &value)
 	}
 }
 
+std::shared_ptr<EventSub> TwitchToken::GetEventSub()
+{
+	if (!_eventSub) {
+		_eventSub = std::make_shared<EventSub>();
+	}
+	return _eventSub;
+}
+
 TwitchToken *GetTwitchTokenByName(const QString &name)
 {
 	return GetTwitchTokenByName(name.toStdString());
diff --git a/src/macro-external/twitch/token.hpp b/src/macro-external/twitch/token.hpp
index f6068a4b..e19dc4d1 100644
--- a/src/macro-external/twitch/token.hpp
+++ b/src/macro-external/twitch/token.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#include "event-sub.hpp"
+
 #include <item-selection-helpers.hpp>
 #include <httplib.h>
 #include <set>
@@ -41,11 +43,13 @@ public:
 	bool IsEmpty() const { return _token.empty(); }
 	std::string GetToken() const { return _token; }
 	std::string GetUserID() const { return _userID; }
+	std::shared_ptr<EventSub> GetEventSub();
 
 private:
 	std::string _token;
 	std::string _userID;
 	std::set<TokenOption> _tokenOptions = {{"channel:manage:broadcast"}};
+	std::shared_ptr<EventSub> _eventSub;
 
 	static bool _setup;