diff --git a/CHANGES.rst b/CHANGES.rst
index 2148c8f5c..f0ae4b3a3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ Improvements:
  * Maintenance: Update cocopoads and pods. Automatic update to Swift4.2.
  * Add app store description as app string resource to make them available for translation on weblate (#2201).
  * Update deprecated contact availability checks (#2222).
+ * RoomVC: Remove the beta warning modal when enabling e2e in a room (#2239).
 
 Bug fix:
  * Reskin: status bar text is no more readable on iPad (#2276).
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index beb282e7b..c328fd026 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -494,7 +494,6 @@
 "room_details_advanced_e2e_encryption_enabled"="Encryption is enabled in this room";
 "room_details_advanced_e2e_encryption_disabled"="Encryption is not enabled in this room.";
 "room_details_advanced_e2e_encryption_blacklist_unverified_devices"="Encrypt to verified devices only";
-"room_details_advanced_e2e_encryption_prompt_message"="End-to-end encryption is experimental and may not be reliable.\n\nYou should not yet trust it to secure data.\n\nDevices will not yet be able to decrypt history from before they joined the room.\n\nOnce encryption is enabled for a room it cannot be turned off again (for now).\n\nEncrypted messages will not be visible on clients that do not yet implement encryption.";
 "room_details_fail_to_update_avatar" = "Fail to update the room photo";
 "room_details_fail_to_update_room_name" = "Fail to update the room name";
 "room_details_fail_to_update_topic" = "Fail to update the topic";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 8c5f900a0..7322f28f3 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -1126,10 +1126,6 @@ internal enum VectorL10n {
   internal static var roomDetailsAdvancedE2eEncryptionEnabled: String { 
     return VectorL10n.tr("Vector", "room_details_advanced_e2e_encryption_enabled") 
   }
-  /// End-to-end encryption is experimental and may not be reliable.\n\nYou should not yet trust it to secure data.\n\nDevices will not yet be able to decrypt history from before they joined the room.\n\nOnce encryption is enabled for a room it cannot be turned off again (for now).\n\nEncrypted messages will not be visible on clients that do not yet implement encryption.
-  internal static var roomDetailsAdvancedE2eEncryptionPromptMessage: String { 
-    return VectorL10n.tr("Vector", "room_details_advanced_e2e_encryption_prompt_message") 
-  }
   /// Enable encryption (warning: cannot be disabled again!)
   internal static var roomDetailsAdvancedEnableE2eEncryption: String { 
     return VectorL10n.tr("Vector", "room_details_advanced_enable_e2e_encryption") 
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index bd287fae9..afbaba5de 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -3421,48 +3421,9 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
 {
     if (theSwitch.on)
     {
-        // Prompt here user before turning on the data encryption
-        __weak typeof(self) weakSelf = self;
-        
-        [currentAlert dismissViewControllerAnimated:NO completion:nil];
-        
-        currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"warning", @"Vector", nil)
-                                                           message:NSLocalizedStringFromTable(@"room_details_advanced_e2e_encryption_prompt_message", @"Vector", nil)
-                                                    preferredStyle:UIAlertControllerStyleAlert];
-        
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction * action) {
-                                                           
-                                                           if (weakSelf)
-                                                           {
-                                                               typeof(self) self = weakSelf;
-                                                               self->currentAlert = nil;
-                                                           }
-                                                           
-                                                           // Reset switch change
-                                                           theSwitch.on = NO;
-                                                           
-                                                       }]];
-        
-        [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction * action) {
-                                                           
-                                                           if (weakSelf)
-                                                           {
-                                                               typeof(self) self = weakSelf;
-                                                               self->currentAlert = nil;
-                                                               
-                                                               self->updatedItemsDict[kRoomSettingsEncryptionKey] = @(YES);
-                                                               
-                                                               [self getNavigationItem].rightBarButtonItem.enabled = self->updatedItemsDict.count;
-                                                           }
-                                                           
-                                                       }]];
-        
-        [currentAlert mxk_setAccessibilityIdentifier:@"RoomSettingsVCEnableEncryptionAlert"];
-        [self presentViewController:currentAlert animated:YES completion:nil];
+        updatedItemsDict[kRoomSettingsEncryptionKey] = @(YES);
+
+        [self getNavigationItem].rightBarButtonItem.enabled = self->updatedItemsDict.count;
     }
     else
     {