diff --git a/app/views/ShareListView/index.js b/app/views/ShareListView/index.js
index f2b1d25ca..8d5f7b0eb 100644
--- a/app/views/ShareListView/index.js
+++ b/app/views/ShareListView/index.js
@@ -195,7 +195,7 @@ class ShareListView extends React.Component {
 			Q.where('archived', false),
 			Q.where('open', true),
 			Q.experimentalSkip(0),
-			Q.experimentalTake(50),
+			Q.experimentalTake(20),
 			Q.experimentalSortBy('room_updated_at', Q.desc)
 		];
 		if (text) {
@@ -451,11 +451,9 @@ class ShareListView extends React.Component {
 				ListFooterComponent={!searching && this.renderBorderBottom}
 				ListHeaderComponentStyle={!searching ? { ...styles.borderBottom, borderColor: themes[theme].separatorColor } : {}}
 				ListEmptyComponent={searching && searchText ? this.renderEmptyComponent : null}
-				enableEmptySections
 				removeClippedSubviews
 				keyboardShouldPersistTaps='always'
 				initialNumToRender={12}
-				windowSize={20}
 			/>
 		);
 	}
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 4d25556b4..709857fb5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -461,7 +461,7 @@ PODS:
     - React
   - ReactNativeUiLib (3.0.4):
     - React
-  - rn-extensions-share (2.4.0):
+  - rn-extensions-share (2.4.1):
     - React
   - rn-fetch-blob (0.12.0):
     - React-Core
@@ -964,7 +964,7 @@ SPEC CHECKSUMS:
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
   ReactNativeUiLib: cde7263a7d308b60161cd286f95c9433e79f2f7d
-  rn-extensions-share: 8db79372089567cbc5aefe8444869bbc808578d3
+  rn-extensions-share: 5fd84a80e6594706f0dfa1884f2d6d591b382cf5
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNBootSplash: b3836aa90c5bec690c6cd3c9ab355fcf98d0fe1d
   RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
diff --git a/ios/Pods/Local Podspecs/rn-extensions-share.podspec.json b/ios/Pods/Local Podspecs/rn-extensions-share.podspec.json
index 9d084a5ea..dc0c56a99 100644
--- a/ios/Pods/Local Podspecs/rn-extensions-share.podspec.json	
+++ b/ios/Pods/Local Podspecs/rn-extensions-share.podspec.json	
@@ -1,6 +1,6 @@
 {
   "name": "rn-extensions-share",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "summary": "Share-Extension using react-native for both ios and android",
   "license": "MIT",
   "authors": {
diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock
index 4d25556b4..709857fb5 100644
--- a/ios/Pods/Manifest.lock
+++ b/ios/Pods/Manifest.lock
@@ -461,7 +461,7 @@ PODS:
     - React
   - ReactNativeUiLib (3.0.4):
     - React
-  - rn-extensions-share (2.4.0):
+  - rn-extensions-share (2.4.1):
     - React
   - rn-fetch-blob (0.12.0):
     - React-Core
@@ -964,7 +964,7 @@ SPEC CHECKSUMS:
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
   ReactNativeUiLib: cde7263a7d308b60161cd286f95c9433e79f2f7d
-  rn-extensions-share: 8db79372089567cbc5aefe8444869bbc808578d3
+  rn-extensions-share: 5fd84a80e6594706f0dfa1884f2d6d591b382cf5
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNBootSplash: b3836aa90c5bec690c6cd3c9ab355fcf98d0fe1d
   RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
diff --git a/package.json b/package.json
index 6b941d5a3..b41a54c50 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "redux-saga": "1.1.3",
     "remove-markdown": "^0.3.0",
     "reselect": "4.0.0",
-    "rn-extensions-share": "^2.4.0",
+    "rn-extensions-share": "RocketChat/rn-extensions-share",
     "rn-fetch-blob": "0.12.0",
     "rn-root-view": "^1.0.3",
     "semver": "7.3.2",
diff --git a/yarn.lock b/yarn.lock
index 12386a08b..1dcea128a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13829,10 +13829,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rn-extensions-share@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/rn-extensions-share/-/rn-extensions-share-2.4.0.tgz#a614f6bf6cdd3948fbd7e0f2519592d4bb5f551f"
-  integrity sha512-zX3HcOhib805fVHR7TMYfFXrVBJWYgcrLYNB89RxbKqmSjaqUyWlHYuF61SKOs/dXXeic91e/L8d1YJa6TdzGA==
+rn-extensions-share@RocketChat/rn-extensions-share:
+  version "2.4.1"
+  resolved "https://codeload.github.com/RocketChat/rn-extensions-share/tar.gz/4d7c0e4c2f300e4fb116af7b7cc0dbbc8169150c"
 
 rn-fetch-blob@0.12.0:
   version "0.12.0"