diff --git a/CHANGES.md b/CHANGES.md
index ef6f09c1..c47cf2b8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.16.4 (2021-09-30)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.4)).
+
+
 ## Changes in 0.16.3 (2021-09-28)
 
 🙌 Improvements
diff --git a/MatrixKit.podspec b/MatrixKit.podspec
index 3e8036f8..4faea4b3 100644
--- a/MatrixKit.podspec
+++ b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.3"
+  s.version      = "0.16.4"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.20.3"
+  s.dependency 'MatrixSDK', "= 0.20.4"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'
diff --git a/MatrixKit/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m
index 07b50015..8fe004bd 100644
--- a/MatrixKit/MatrixKitVersion.m
+++ b/MatrixKit/MatrixKitVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.16.3";
+NSString *const MatrixKitVersion = @"0.16.4";
diff --git a/Podfile b/Podfile
index 907848d1..c12e523d 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
     
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.20.3'
+    pod 'MatrixSDK', '= 0.20.4'
     
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'
diff --git a/Podfile.lock b/Podfile.lock
index 0d9cc490..72ead947 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,9 +39,9 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.20.3):
-    - MatrixSDK/Core (= 0.20.3)
-  - MatrixSDK/Core (0.20.3):
+  - MatrixSDK (0.20.4):
+    - MatrixSDK/Core (= 0.20.4)
+  - MatrixSDK/Core (0.20.4):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -64,7 +64,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.3)
+  - MatrixSDK (= 0.20.4)
 
 SPEC REPOS:
   trunk:
@@ -94,11 +94,11 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: de1158691a3b3bfb0cc7a294f358f9def3d3cd9c
+  MatrixSDK: 317928f6ef7bbffebbf7dbf9ca9dad4920695f1e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: 7ea8bc6bb3b9bf004857ffc9a7b1d0835afc8b9a
+PODFILE CHECKSUM: a2a9b1e23c0e1fa628bfb188c6cf75de2b89676a
 
 COCOAPODS: 1.10.1