diff --git a/include/rtc/peerconnection.hpp b/include/rtc/peerconnection.hpp
index e07ad4461..597d792c4 100644
--- a/include/rtc/peerconnection.hpp
+++ b/include/rtc/peerconnection.hpp
@@ -35,11 +35,6 @@ struct RTC_CPP_EXPORT DataChannelInit {
 	string protocol = "";
 };
 
-struct RTC_CPP_EXPORT RemoteFingerprint {
-	string value;
-	CertificateFingerprint::Algorithm algorithm;
-};
-
 class RTC_CPP_EXPORT PeerConnection final : CheshireCat<impl::PeerConnection> {
 public:
 	enum class State : int {
@@ -118,7 +113,7 @@ class RTC_CPP_EXPORT PeerConnection final : CheshireCat<impl::PeerConnection> {
 	void onSignalingStateChange(std::function<void(SignalingState state)> callback);
 
 	void resetCallbacks();
-	std::vector<struct RemoteFingerprint> remoteFingerprints();
+	CertificateFingerprint remoteFingerprint();
 
 	// Stats
 	void clearStats();
diff --git a/src/impl/peerconnection.cpp b/src/impl/peerconnection.cpp
index 4f83e96f5..c305384aa 100644
--- a/src/impl/peerconnection.cpp
+++ b/src/impl/peerconnection.cpp
@@ -234,12 +234,14 @@ shared_ptr<DtlsTransport> PeerConnection::initDtlsTransport() {
 			fingerprintAlgorithm = remote->fingerprint()->algorithm;
 		}
 
+		mRemoteFingerprintAlgorithm = fingerprintAlgorithm;
+
 		auto lower = std::atomic_load(&mIceTransport);
 		if (!lower)
 			throw std::logic_error("No underlying ICE transport for DTLS transport");
 
 		auto certificate = mCertificate.get();
-		auto verifierCallback = weak_bind(&PeerConnection::checkFingerprint, this, _1, fingerprintAlgorithm);
+		auto verifierCallback = weak_bind(&PeerConnection::checkFingerprint, this, _1);
 		auto dtlsStateChangeCallback =
 		    [this, weak_this = weak_from_this()](DtlsTransport::State transportState) {
 			    auto shared_this = weak_this.lock();
@@ -439,15 +441,21 @@ void PeerConnection::rollbackLocalDescription() {
 	}
 }
 
-bool PeerConnection::checkFingerprint(const std::string &fingerprint, const CertificateFingerprint::Algorithm &algorithm) {
+bool PeerConnection::checkFingerprint(const std::string &fingerprint) {
 	std::lock_guard lock(mRemoteDescriptionMutex);
 	if (!mRemoteDescription || !mRemoteDescription->fingerprint())
 		return false;
 
+  if (config.disableFingerprintVerification) {
+		PLOG_VERBOSE << "Skipping fingerprint validation";
+		mRemoteFingerprint = fingerprint;
+		return true;
+	}
+
 	auto expectedFingerprint = mRemoteDescription->fingerprint()->value;
-	if (config.disableFingerprintVerification || expectedFingerprint == fingerprint) {
+	if (expectedFingerprint == fingerprint) {
 		PLOG_VERBOSE << "Valid fingerprint \"" << fingerprint << "\"";
-		storeRemoteFingerprint(fingerprint, algorithm);
+		mRemoteFingerprint = fingerprint;
 		return true;
 	}
 
@@ -455,20 +463,6 @@ bool PeerConnection::checkFingerprint(const std::string &fingerprint, const Cert
 	return false;
 }
 
-void PeerConnection::storeRemoteFingerprint(const std::string &value, const CertificateFingerprint::Algorithm &algorithm) {
-	auto iter = std::find_if(rFingerprints.begin(), rFingerprints.end(), [&](const RemoteFingerprint& existing){return existing.value == value;});
-  bool seenPreviously = iter != rFingerprints.end();
-
-	if (seenPreviously) {
-		return;
-	}
-
-	rFingerprints.push_back({
-		value,
-		algorithm
-	});
-}
-
 void PeerConnection::forwardMessage(message_ptr message) {
 	if (!message) {
 		remoteCloseDataChannels();
@@ -1313,11 +1307,11 @@ void PeerConnection::resetCallbacks() {
 	trackCallback = nullptr;
 }
 
-std::vector<struct RemoteFingerprint> PeerConnection::remoteFingerprints() {
-	std::vector<struct RemoteFingerprint> ret;
-	ret = rFingerprints;
-
-	return ret;
+CertificateFingerprint PeerConnection::remoteFingerprint() {
+	if (mRemoteFingerprint)
+		return {CertificateFingerprint{mRemoteFingerprintAlgorithm, *mRemoteFingerprint}};
+	else
+		return {};
 }
 
 void PeerConnection::updateTrackSsrcCache(const Description &description) {
diff --git a/src/impl/peerconnection.hpp b/src/impl/peerconnection.hpp
index 4fd611939..37e07cbd7 100644
--- a/src/impl/peerconnection.hpp
+++ b/src/impl/peerconnection.hpp
@@ -53,7 +53,7 @@ struct PeerConnection : std::enable_shared_from_this<PeerConnection> {
 
 	void endLocalCandidates();
 	void rollbackLocalDescription();
-	bool checkFingerprint(const std::string &fingerprint, const CertificateFingerprint::Algorithm &algorithm);
+	bool checkFingerprint(const std::string &fingerprint);
 	void forwardMessage(message_ptr message);
 	void forwardMedia(message_ptr message);
 	void forwardBufferedAmount(uint16_t stream, size_t amount);
@@ -98,7 +98,7 @@ struct PeerConnection : std::enable_shared_from_this<PeerConnection> {
 	bool changeSignalingState(SignalingState newState);
 
 	void resetCallbacks();
-	std::vector<struct RemoteFingerprint> remoteFingerprints();
+	CertificateFingerprint remoteFingerprint();
 
 	// Helper method for asynchronous callback invocation
 	template <typename... Args> void trigger(synchronized_callback<Args...> *cb, Args... args) {
@@ -130,7 +130,6 @@ struct PeerConnection : std::enable_shared_from_this<PeerConnection> {
 private:
 	void dispatchMedia(message_ptr message);
 	void updateTrackSsrcCache(const Description &description);
-	void storeRemoteFingerprint(const std::string &fingerprint, const CertificateFingerprint::Algorithm &algorithm);
 
 	const init_token mInitToken = Init::Instance().token();
 	future_certificate_ptr mCertificate;
@@ -160,7 +159,8 @@ struct PeerConnection : std::enable_shared_from_this<PeerConnection> {
 	Queue<shared_ptr<DataChannel>> mPendingDataChannels;
 	Queue<shared_ptr<Track>> mPendingTracks;
 
-	std::vector<struct RemoteFingerprint> rFingerprints;
+	CertificateFingerprint::Algorithm mRemoteFingerprintAlgorithm = CertificateFingerprint::Algorithm::Sha256;
+	optional<string> mRemoteFingerprint;
 };
 
 } // namespace rtc::impl
diff --git a/src/peerconnection.cpp b/src/peerconnection.cpp
index caaef24bb..495cd1c3d 100644
--- a/src/peerconnection.cpp
+++ b/src/peerconnection.cpp
@@ -367,8 +367,8 @@ optional<std::chrono::milliseconds> PeerConnection::rtt() {
 	return sctpTransport ? sctpTransport->rtt() : nullopt;
 }
 
-std::vector<struct RemoteFingerprint> PeerConnection::remoteFingerprints() {
-	return impl()->remoteFingerprints();
+CertificateFingerprint PeerConnection::remoteFingerprint() {
+	return impl()->remoteFingerprint();
 }
 
 std::ostream &operator<<(std::ostream &out, PeerConnection::State state) {