diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings
index 5d992d447..7648b98c3 100644
--- a/Riot/Assets/de.lproj/Bwi.strings
+++ b/Riot/Assets/de.lproj/Bwi.strings
@@ -743,3 +743,5 @@
 "introduce_federation_screen3_title" = "Individuelle Einstellung";
 "introduce_federation_screen3_description" = "Bestimme als Admin, welche Räume für eine Föderation zugelassen sind.";
 "introduce_federation_start" = "Verstanden";
+
+"room_error_join_failed_federation_disabled_message" = "Du kannst den Raum nicht beitreten. Grund: Die Föderation wurde für diesen Raum aufgehoben.";
diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings
index 11b4b3ee5..01a661c02 100644
--- a/Riot/Assets/en.lproj/Bwi.strings
+++ b/Riot/Assets/en.lproj/Bwi.strings
@@ -656,3 +656,5 @@
 "introduce_federation_screen3_title" = "Individual settings";
 "introduce_federation_screen3_description" = "Decide as an admin which room should be authorized for federation.";
 "introduce_federation_start" = "Understood";
+
+"room_error_join_failed_federation_disabled_message" = "You cannot join the room. The federation for this room has been withdrawn.";
diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift
index f2a79938c..89cf80728 100644
--- a/Riot/Generated/BWIStrings.swift
+++ b/Riot/Generated/BWIStrings.swift
@@ -1371,6 +1371,10 @@ public class BWIL10n: NSObject {
   public static var roomDetailsTitleForDm: String { 
     return BWIL10n.tr("Bwi", "room_details_title_for_dm") 
   }
+  /// Du kannst den Raum nicht beitreten. Grund: Die Föderation wurde für diesen Raum aufgehoben.
+  public static var roomErrorJoinFailedFederationDisabledMessage: String { 
+    return BWIL10n.tr("Bwi", "room_error_join_failed_federation_disabled_message") 
+  }
   /// Umfrage beenden
   public static var roomEventActionEndPoll: String { 
     return BWIL10n.tr("Bwi", "room_event_action_end_poll") 
diff --git a/Riot/Modules/Room/MXKRoomViewController.m b/Riot/Modules/Room/MXKRoomViewController.m
index 66f1a9ee5..c984c799a 100644
--- a/Riot/Modules/Room/MXKRoomViewController.m
+++ b/Riot/Modules/Room/MXKRoomViewController.m
@@ -993,6 +993,12 @@ static const CGFloat kCellVisibilityMinimumHeight = 8.0;
         msg = [VectorL10n roomErrorJoinFailedEmptyRoom];
     }
     
+    // bwi: #5716 show custom error message when the federation was disabled after the user has been invited to a federated room
+    if ([msg isEqualToString:@"Server is banned from room"])
+    {
+        msg = BWIL10n.roomErrorJoinFailedFederationDisabledMessage;
+    }
+    
     MXWeakify(self);
     [self->currentAlert dismissViewControllerAnimated:NO completion:nil];