diff --git a/CMakeLists.txt b/CMakeLists.txt
index 368843e7..026e3c4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,8 +580,8 @@ if(USE_BUNDLED_MTXCLIENT)
 	include(FetchContent)
 	FetchContent_Declare(
 		MatrixClient
-		GIT_REPOSITORY https://github.com/r0hit05/mtxclient.git
-		GIT_TAG        9743ddde60151c2d0e3fd622d5e3fe469813f5d9
+		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
+		GIT_TAG        c2824dae5050882872a6c3f5677f3309a60511be
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 9fbf53da..879043b2 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -203,10 +203,10 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: 9743ddde60151c2d0e3fd622d5e3fe469813f5d9
+      - commit: c2824dae5050882872a6c3f5677f3309a60511be
         #tag: v0.7.0
         type: git
-        url: https://github.com/r0hit05/mtxclient.git
+        url: https://github.com/Nheko-Reborn/mtxclient.git
   - config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DLMDBXX_INCLUDE_DIR=.deps/lmdbxx
diff --git a/src/voip/CallManager.cpp b/src/voip/CallManager.cpp
index d479a937..14f3adf8 100644
--- a/src/voip/CallManager.cpp
+++ b/src/voip/CallManager.cpp
@@ -44,6 +44,7 @@ using namespace mtx::events;
 using namespace mtx::events::voip;
 
 using webrtc::CallType;
+//! Session Description Object
 typedef RTCSessionDescriptionInit SDO;
 
 namespace {
@@ -66,7 +67,9 @@ CallManager::CallManager(QObject *parent)
       this,
       [this](const std::string &sdp, const std::vector<CallCandidates::Candidate> &candidates) {
           nhlog::ui()->debug("WebRTC: call id: {} - sending offer", callid_);
-          emit newMessage(roomid_, CallInvite{callid_, partyid_, SDO{sdp, SDO::Type::Offer}, "0", timeoutms_, invitee_});
+          emit newMessage(
+            roomid_,
+            CallInvite{callid_, partyid_, SDO{sdp, SDO::Type::Offer}, "0", timeoutms_, invitee_});
           emit newMessage(roomid_, CallCandidates{callid_, partyid_, candidates, "0"});
           std::string callid(callid_);
           QTimer::singleShot(timeoutms_, this, [this, callid]() {
@@ -299,7 +302,8 @@ CallManager::handleEvent(const RoomEvent<CallInvite> &callInviteEvent)
     if (isOnCall() || roomInfo.member_count != 2) {
         emit newMessage(
           QString::fromStdString(callInviteEvent.room_id),
-          CallHangUp{callInviteEvent.content.call_id, partyid_, "0", CallHangUp::Reason::InviteTimeOut});
+          CallHangUp{
+            callInviteEvent.content.call_id, partyid_, "0", CallHangUp::Reason::InviteTimeOut});
         return;
     }
 
diff --git a/src/voip/CallManager.h b/src/voip/CallManager.h
index 52d33739..16bd9a37 100644
--- a/src/voip/CallManager.h
+++ b/src/voip/CallManager.h
@@ -67,7 +67,8 @@ public slots:
     void toggleMicMute();
     void toggleLocalPiP() { session_.toggleLocalPiP(); }
     void acceptInvite();
-    void hangUp(mtx::events::voip::CallHangUp::Reason = mtx::events::voip::CallHangUp::Reason::User);
+    void
+      hangUp(mtx::events::voip::CallHangUp::Reason = mtx::events::voip::CallHangUp::Reason::User);
     QStringList windowList();
     void previewWindow(unsigned int windowIndex) const;
 
@@ -92,8 +93,8 @@ private:
     QString callPartyDisplayName_;
     QString callPartyAvatarUrl_;
     std::string callid_;
-    std::string partyid_ = "";
-    std::string invitee_ = "";
+    std::string partyid_       = "";
+    std::string invitee_       = "";
     const uint32_t timeoutms_  = 120000;
     webrtc::CallType callType_ = webrtc::CallType::VOICE;
     bool haveCallInvite_       = false;
diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp
index a99ff5b8..48e878e8 100644
--- a/src/voip/WebRTCSession.cpp
+++ b/src/voip/WebRTCSession.cpp
@@ -1151,7 +1151,8 @@ WebRTCSession::acceptAnswer(const std::string &)
 }
 
 void
-WebRTCSession::acceptICECandidates(const std::vector<mtx::events::voip::CallCandidates::Candidate> &)
+WebRTCSession::acceptICECandidates(
+  const std::vector<mtx::events::voip::CallCandidates::Candidate> &)
 {}
 
 bool