diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp
index c90360b6..69a45037 100644
--- a/src/WSEvents.cpp
+++ b/src/WSEvents.cpp
@@ -252,14 +252,14 @@ void WSEvents::broadcastUpdate(const char* updateType,
 	if (!_srv->isListening()) {
 		return;
 	}
-	std::optional<uint64_t> streamTime;
+	uint64_t streamTime = 0;
 	if (obs_frontend_streaming_active()) {
-		streamTime = std::make_optional(getStreamingTime());
+		streamTime = getStreamingTime();
 	}
 
-	std::optional<uint64_t> recordingTime;
+	uint64_t recordingTime;
 	if (obs_frontend_recording_active()) {
-		recordingTime = std::make_optional(getRecordingTime());
+		recordingTime = getRecordingTime();
 	}
 
 	RpcEvent event(QString(updateType), streamTime, recordingTime, additionalFields);
diff --git a/src/protocol/OBSRemoteProtocol.cpp b/src/protocol/OBSRemoteProtocol.cpp
index 4d37f299..91698e8a 100644
--- a/src/protocol/OBSRemoteProtocol.cpp
+++ b/src/protocol/OBSRemoteProtocol.cpp
@@ -64,15 +64,15 @@ std::string OBSRemoteProtocol::encodeEvent(const RpcEvent& event)
 	QString updateType = event.updateType();
 	obs_data_set_string(eventData, "update-type", updateType.toUtf8().constData());
 
-	std::optional<uint64_t> streamTime = event.streamTime();
-	if (streamTime.has_value()) {
-		QString streamingTimecode = Utils::nsToTimestamp(streamTime.value());
+	auto streamTime = event.streamTime();
+	if (streamTime) {
+		QString streamingTimecode = Utils::nsToTimestamp(streamTime);
 		obs_data_set_string(eventData, "stream-timecode", streamingTimecode.toUtf8().constData());
 	}
 
-	std::optional<uint64_t> recordingTime = event.recordingTime();
-	if (recordingTime.has_value()) {
-		QString recordingTimecode = Utils::nsToTimestamp(recordingTime.value());
+	auto recordingTime = event.recordingTime();
+	if (recordingTime) {
+		QString recordingTimecode = Utils::nsToTimestamp(recordingTime);
 		obs_data_set_string(eventData, "rec-timecode", recordingTimecode.toUtf8().constData());
 	}
 
diff --git a/src/rpc/RpcEvent.cpp b/src/rpc/RpcEvent.cpp
index a971b6a2..a8d3b06b 100644
--- a/src/rpc/RpcEvent.cpp
+++ b/src/rpc/RpcEvent.cpp
@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 RpcEvent::RpcEvent(
 	const QString& updateType,
-	std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
+	uint64_t streamTime, uint64_t recordingTime,
 	obs_data_t* additionalFields
 ) :
 	_updateType(updateType),
diff --git a/src/rpc/RpcEvent.h b/src/rpc/RpcEvent.h
index af69a10e..6dd0df99 100644
--- a/src/rpc/RpcEvent.h
+++ b/src/rpc/RpcEvent.h
@@ -18,7 +18,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #pragma once
 
-#include <optional>
 #include <obs-data.h>
 #include <QtCore/QString>
 
@@ -29,7 +28,7 @@ class RpcEvent
 public:
 	explicit RpcEvent(
 		const QString& updateType,
-		std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
+		uint64_t streamTime, uint64_t recordingTime,
 		obs_data_t* additionalFields = nullptr
 	);
 
@@ -38,12 +37,12 @@ public:
 		return _updateType;
 	}
 
-	const std::optional<uint64_t> streamTime() const
+	const uint64_t streamTime() const
 	{
 		return _streamTime;
 	}
 
-	const std::optional<uint64_t> recordingTime() const
+	const uint64_t recordingTime() const
 	{
 		return _recordingTime;
 	}
@@ -55,7 +54,7 @@ public:
 
 private:
 	QString _updateType;
-	std::optional<uint64_t> _streamTime;
-	std::optional<uint64_t> _recordingTime;
+	uint64_t _streamTime;
+	uint64_t _recordingTime;
 	OBSDataAutoRelease _additionalFields;
 };