diff --git a/bridge/matrix/helpers.go b/bridge/matrix/helpers.go
index 03e448da..b8e848a2 100644
--- a/bridge/matrix/helpers.go
+++ b/bridge/matrix/helpers.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	matrix "github.com/matrix-org/gomatrix"
+	matrix "github.com/matterbridge/gomatrix"
 )
 
 func newMatrixUsername(username string) *matrixUsername {
diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go
index 706ae302..a2525358 100644
--- a/bridge/matrix/matrix.go
+++ b/bridge/matrix/matrix.go
@@ -12,7 +12,7 @@ import (
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
-	matrix "github.com/matrix-org/gomatrix"
+	matrix "github.com/matterbridge/gomatrix"
 )
 
 var (
diff --git a/go.mod b/go.mod
index 02c9437f..8d8ff8b3 100644
--- a/go.mod
+++ b/go.mod
@@ -23,9 +23,9 @@ require (
 	github.com/kyokomi/emoji/v2 v2.2.9
 	github.com/labstack/echo/v4 v4.7.0
 	github.com/lrstanley/girc v0.0.0-20211023233735-147f0ff77566
-	github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
 	github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
 	github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be
+	github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
 	github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
 	github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
 	github.com/matterbridge/matterclient v0.0.0-20211107234719-faca3cd42315
@@ -135,6 +135,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
-replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
+//replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
 
 go 1.17
diff --git a/vendor/github.com/matrix-org/gomatrix/.gitignore b/vendor/github.com/matterbridge/gomatrix/.gitignore
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/.gitignore
rename to vendor/github.com/matterbridge/gomatrix/.gitignore
diff --git a/vendor/github.com/matrix-org/gomatrix/.golangci.yml b/vendor/github.com/matterbridge/gomatrix/.golangci.yml
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/.golangci.yml
rename to vendor/github.com/matterbridge/gomatrix/.golangci.yml
diff --git a/vendor/github.com/matrix-org/gomatrix/.travis.yml b/vendor/github.com/matterbridge/gomatrix/.travis.yml
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/.travis.yml
rename to vendor/github.com/matterbridge/gomatrix/.travis.yml
diff --git a/vendor/github.com/matrix-org/gomatrix/CHANGELOG.md b/vendor/github.com/matterbridge/gomatrix/CHANGELOG.md
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/CHANGELOG.md
rename to vendor/github.com/matterbridge/gomatrix/CHANGELOG.md
diff --git a/vendor/github.com/matrix-org/gomatrix/LICENSE b/vendor/github.com/matterbridge/gomatrix/LICENSE
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/LICENSE
rename to vendor/github.com/matterbridge/gomatrix/LICENSE
diff --git a/vendor/github.com/matrix-org/gomatrix/README.md b/vendor/github.com/matterbridge/gomatrix/README.md
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/README.md
rename to vendor/github.com/matterbridge/gomatrix/README.md
diff --git a/vendor/github.com/matrix-org/gomatrix/client.go b/vendor/github.com/matterbridge/gomatrix/client.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/client.go
rename to vendor/github.com/matterbridge/gomatrix/client.go
diff --git a/vendor/github.com/matrix-org/gomatrix/events.go b/vendor/github.com/matterbridge/gomatrix/events.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/events.go
rename to vendor/github.com/matterbridge/gomatrix/events.go
diff --git a/vendor/github.com/matrix-org/gomatrix/filter.go b/vendor/github.com/matterbridge/gomatrix/filter.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/filter.go
rename to vendor/github.com/matterbridge/gomatrix/filter.go
diff --git a/vendor/github.com/matrix-org/gomatrix/identifier.go b/vendor/github.com/matterbridge/gomatrix/identifier.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/identifier.go
rename to vendor/github.com/matterbridge/gomatrix/identifier.go
diff --git a/vendor/github.com/matrix-org/gomatrix/requests.go b/vendor/github.com/matterbridge/gomatrix/requests.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/requests.go
rename to vendor/github.com/matterbridge/gomatrix/requests.go
diff --git a/vendor/github.com/matrix-org/gomatrix/responses.go b/vendor/github.com/matterbridge/gomatrix/responses.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/responses.go
rename to vendor/github.com/matterbridge/gomatrix/responses.go
diff --git a/vendor/github.com/matrix-org/gomatrix/room.go b/vendor/github.com/matterbridge/gomatrix/room.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/room.go
rename to vendor/github.com/matterbridge/gomatrix/room.go
diff --git a/vendor/github.com/matrix-org/gomatrix/store.go b/vendor/github.com/matterbridge/gomatrix/store.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/store.go
rename to vendor/github.com/matterbridge/gomatrix/store.go
diff --git a/vendor/github.com/matrix-org/gomatrix/sync.go b/vendor/github.com/matterbridge/gomatrix/sync.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/sync.go
rename to vendor/github.com/matterbridge/gomatrix/sync.go
diff --git a/vendor/github.com/matrix-org/gomatrix/tags.go b/vendor/github.com/matterbridge/gomatrix/tags.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/tags.go
rename to vendor/github.com/matterbridge/gomatrix/tags.go
diff --git a/vendor/github.com/matrix-org/gomatrix/userids.go b/vendor/github.com/matterbridge/gomatrix/userids.go
similarity index 100%
rename from vendor/github.com/matrix-org/gomatrix/userids.go
rename to vendor/github.com/matterbridge/gomatrix/userids.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6c4d9bcd..6a01071f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -189,9 +189,6 @@ github.com/lrstanley/girc
 # github.com/magiconair/properties v1.8.5
 ## explicit; go 1.13
 github.com/magiconair/properties
-# github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
-## explicit; go 1.17
-github.com/matrix-org/gomatrix
 # github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
 ## explicit
 github.com/matterbridge/Rocket.Chat.Go.SDK/models
@@ -200,6 +197,9 @@ github.com/matterbridge/Rocket.Chat.Go.SDK/rest
 # github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be
 ## explicit
 github.com/matterbridge/go-xmpp
+# github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419
+## explicit; go 1.17
+github.com/matterbridge/gomatrix
 # github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
 ## explicit
 github.com/matterbridge/gozulipbot
@@ -603,4 +603,3 @@ layeh.com/gumble/gumble
 layeh.com/gumble/gumble/MumbleProto
 layeh.com/gumble/gumble/varint
 layeh.com/gumble/gumbleutil
-# github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419