diff --git a/synapse/server.py b/synapse/server.py
index 439b9d628..24f3a8810 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -126,6 +126,11 @@ class BaseHomeServer(object):
         object."""
         return UserID.from_string(s, hs=self)
 
+    def parse_roomid(self, s):
+        """Parse the string given by 's' as a Room ID and return a RoomID
+        object."""
+        return RoomID.from_string(s, hs=self)
+
     def parse_roomalias(self, s):
         """Parse the string given by 's' as a Room Alias and return a RoomAlias
         object."""