diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 54c791615..7567de985 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -47,6 +47,12 @@ final class BuildSettings: NSObject {
     static let stunServerFallbackUrlString: String? = "stun:turn.matrix.org"
     
     
+    // List of homeservers for the public rooms directory
+    static let roomDirectoryServers = [
+        "matrix.org"
+    ]
+    
+    
     // Bug report
     static let bugReportEndpointUrlString = "https://riot.im/bugreports"
     // Use the name allocated by the bug report server
diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist
index d37f53fdb..e3d0c735a 100644
--- a/Riot/Assets/Riot-Defaults.plist
+++ b/Riot/Assets/Riot-Defaults.plist
@@ -75,11 +75,6 @@
 	<integer>15066368</integer>
 	<key>presenceColorForOfflineUser</key>
 	<integer>15020851</integer>
-	<key>roomDirectoryServers</key>
-	<dict>
-		<key>matrix.org</key>
-		<string></string>
-	</dict>
 	<key>enableBotCreation</key>
 	<false/>
 </dict>
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index 09f15cc14..ff7cb5175 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -155,9 +155,8 @@
         MXKDirectoryServersDataSource *directoryServersDataSource = [[MXKDirectoryServersDataSource alloc] initWithMatrixSession:recentsDataSource.publicRoomsDirectoryDataSource.mxSession];
         [directoryServersDataSource finalizeInitialization];
 
-        // Add directory servers from the app settings plist
-        NSArray<NSString*> *roomDirectoryServers = [[NSUserDefaults standardUserDefaults] objectForKey:@"roomDirectoryServers"];
-        directoryServersDataSource.roomDirectoryServers = roomDirectoryServers;
+        // Add directory servers from the app settings
+        directoryServersDataSource.roomDirectoryServers = BuildSettings.roomDirectoryServers;
 
         __weak typeof(self) weakSelf = self;