diff --git a/CHANGES.md b/CHANGES.md
index 001e337f6..f29f2243e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,15 @@
+## Changes in 1.8.16 (2022-05-19)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.6)).
+
+🐛 Bugfixes
+
+- Fixed home screen shrinking too much on opening the keyboard. ([#6184](https://github.com/vector-im/element-ios/pull/6184))
+- Fixed filtering search bar not resetting properly when cancelling or switching tabs. ([#6130](https://github.com/vector-im/element-ios/issues/6130))
+
+
 ## Changes in 1.8.15 (2022-05-18)
 
 ✨ Features
diff --git a/Podfile b/Podfile
index aa463e964..c9b00799b 100644
--- a/Podfile
+++ b/Podfile
@@ -13,7 +13,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.5'
+$matrixSDKVersion = '= 0.23.6'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index c9b399c64..18695f229 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -57,16 +57,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.5):
-    - MatrixSDK/Core (= 0.23.5)
-  - MatrixSDK/Core (0.23.5):
+  - MatrixSDK (0.23.6):
+    - MatrixSDK/Core (= 0.23.6)
+  - MatrixSDK/Core (0.23.6):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.23.5):
+  - MatrixSDK/JingleCallStack (0.23.6):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -117,8 +117,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.5)
-  - MatrixSDK/JingleCallStack (= 0.23.5)
+  - MatrixSDK (= 0.23.6)
+  - MatrixSDK/JingleCallStack (= 0.23.6)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -212,7 +212,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: f31ac1f022ef11318e15e95378deb0974632fcf2
+  MatrixSDK: 1cc198c33d653d48ab6a8be952592fda99d80635
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -229,6 +229,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c3aa90ba466488195e67fdda1f5a4d30c070bda9
+PODFILE CHECKSUM: 0113d1e88340b74fd30fdfb68abbb621724954e5
 
 COCOAPODS: 1.11.2
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index f973b344c..a9bea1d96 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1200"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index dbe84405f..6e7bd5b95 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -2274,7 +2274,8 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     self.recentsTableView.contentOffset = CGPointMake(0, self.recentsSearchBar.frame.size.height);
     self.recentsTableView.tableHeaderView = nil;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self refreshRecentsTable];
+        [self.recentsDataSource searchWithPatterns:nil];
+        [self.recentsSearchBar setText:nil];
     });
 }
 
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index d842baa44..d90131222 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -114,7 +114,7 @@
         [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeHome];
         
         // Reset filtering on the shared data source when switching tabs
-        [self searchBarCancelButtonClicked:self.recentsSearchBar];
+        [recentsDataSource searchWithPatterns:nil];
         [self.recentsSearchBar setText:nil];
     }
 }
diff --git a/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift b/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift
index b39b5723f..4f9c783db 100644
--- a/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift
+++ b/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift
@@ -44,11 +44,16 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
         view.backgroundColor = .clear
         
         stackView = UIStackView()
+        stackView.translatesAutoresizingMaskIntoConstraints = false
         stackView.axis = .vertical
         stackView.distribution = .fill
         stackView.alignment = .fill
         
-        view.vc_addSubViewMatchingParentSafeArea(stackView)
+        view.addSubview(stackView)
+        NSLayoutConstraint.activate([stackView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor),
+                                     stackView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
+                                     stackView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
+                                     stackView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)])
 
         addChild(homeViewController)
         stackView.addArrangedSubview(homeViewController.view)