diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx
index 5d5f474d4..7882b0579 100644
--- a/app/views/RoomsListView/index.tsx
+++ b/app/views/RoomsListView/index.tsx
@@ -229,7 +229,8 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			isMasterDetail,
 			showAvatar,
 			displayMode,
-			encryptionBanner
+			encryptionBanner,
+			showServerDropdown
 		} = this.props;
 		if (
 			sortBy !== nextProps.sortBy ||
@@ -240,7 +241,8 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			displayMode !== nextProps.displayMode ||
 			subscribedRoom !== nextProps.subscribedRoom ||
 			isMasterDetail !== nextProps.isMasterDetail ||
-			encryptionBanner !== nextProps.encryptionBanner
+			encryptionBanner !== nextProps.encryptionBanner ||
+			showServerDropdown !== nextProps.showServerDropdown
 		) {
 			return true;
 		}
diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts
index f422e2715..b5a10bfe2 100644
--- a/e2e/tests/assorted/01-e2eencryption.spec.ts
+++ b/e2e/tests/assorted/01-e2eencryption.spec.ts
@@ -340,7 +340,9 @@ describe('E2E Encryption', () => {
 		});
 
 		it('should add server and create new user', async () => {
-			await sleep(5000);
+			await waitFor(element(by.id('rooms-list-header-server-dropdown-button')))
+				.toBeVisible()
+				.withTimeout(5000);
 			await element(by.id('rooms-list-header-server-dropdown-button')).tap();
 			await waitFor(element(by.id('rooms-list-header-server-dropdown')))
 				.toBeVisible()