diff --git a/CHANGES.rst b/CHANGES.rst
index 5d09b45a1..e9a4f3295 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,7 @@ Changes to be released in next version
  * 
 
 🙌 Improvements
+ * Add `gitter.im` to list of default room directories
  * MasterTabBarController: Show/Hide Home Screen tabs (#4234).
  * RoomVC: Enable / Disable VoIP feature in Rooms (#4236).
  * UnifiedSearchRecentsDataSource: Show/Hide public directory (#4242).
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 5378cb7ed..de586d02d 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -150,7 +150,8 @@ final class BuildSettings: NSObject {
     static let publicRoomsAllowServerChange: Bool = true
     // List of homeservers for the public rooms directory
     static let publicRoomsDirectoryServers = [
-        "matrix.org"
+        "matrix.org",
+        "gitter.im"
     ]