diff --git a/package.json b/package.json
index d95fd1da92..a23ca50d98 100644
--- a/package.json
+++ b/package.json
@@ -74,8 +74,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "2.4.1",
+    "matrix-react-sdk": "1.6.2-rc.1",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 957ad7a003..e1c40a3b6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3175,7 +3175,7 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^4.0.1:
+emojibase-data@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.0.2.tgz#6b5ee0b6e8d04f9fcbca2c308c3341da8be47797"
   integrity sha512-ezU6rqxbrsINFD+lg28IQwRsWLoSpwpt6TH65fBEx/GxIrPpbIP1ZvNu1jUkRD+oALspstjyujZvcv0VlJozhg==
@@ -5947,9 +5947,10 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+matrix-js-sdk@2.4.1:
   version "2.4.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.1.tgz#f32f8ebb1f01fa26711a4cf6b78eae125156f455"
+  integrity sha512-5mOp396eOtvaMiuUD85TWvuxSP532PuvtH/QLugBGenI15FGwtnC40cTnVYviYWGBi340FPrOKWulc5ILRX6qQ==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"
@@ -5970,9 +5971,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "1.6.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/617a5290f9fbf222f756d79a8b6bcd3d80bfec67"
+matrix-react-sdk@1.6.2-rc.1:
+  version "1.6.2-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.6.2-rc.1.tgz#b97748333971f02400e6ceb19fcc908a3085107d"
+  integrity sha512-uuogdK8lfcCgoAxS6xt7SmBbYsh4GgVjQQAueNlzeewdUSRrRzD373vsqgoxShrB0vYgGXqC0eOQatFzv/m9Eg==
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-runtime "^6.26.0"
@@ -5986,7 +5988,7 @@ matrix-mock-request@^1.2.3:
     create-react-class "^15.6.0"
     diff-dom "^4.1.3"
     diff-match-patch "^1.0.4"
-    emojibase-data "^4.0.1"
+    emojibase-data "^4.0.2"
     emojibase-regex "^3.0.0"
     file-saver "^1.3.3"
     filesize "3.5.6"
@@ -6003,7 +6005,7 @@ matrix-mock-request@^1.2.3:
     linkifyjs "^2.1.6"
     lodash "^4.17.14"
     lolex "4.2"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "2.4.1"
     optimist "^0.6.1"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"