diff --git a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
index 6ec9484e66..3daadd924f 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/Views/DirectoryServerTableViewCell.m
@@ -60,6 +60,16 @@ - (void)render:(id<MXKDirectoryServerCellDataStoring>)cellData
         {
             iconURL = [NSString stringWithFormat:@"%@%@", kMXContentUriScheme, [iconURL substringFromIndex:range.location + range.length]];
         }
+        // Check also if we are using the authenticated endpoint
+        else
+        {
+            mxMediaPrefix = [NSString stringWithFormat:@"/%@/download/", kMXAuthenticatedContentPrefixPath];
+            range = [iconURL rangeOfString:mxMediaPrefix];
+            if (range.location != NSNotFound)
+            {
+                iconURL = [NSString stringWithFormat:@"%@%@", kMXContentUriScheme, [iconURL substringFromIndex:range.location + range.length]];
+            }
+        }
         [self.iconImageView setImageURI:iconURL
                                withType:nil
                     andImageOrientation:UIImageOrientationUp
diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index 04e422e1f7..1c4b3f5c32 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit 04e422e1f70eb3c32b9d0067cf9721bdc295caa0
+Subproject commit 1c4b3f5c32ed3bcf27d3404c770e000a50417352