diff --git a/server/rooms/wagtail_hooks.py b/server/rooms/wagtail_hooks.py
index ed05d5cf..cc28d9aa 100644
--- a/server/rooms/wagtail_hooks.py
+++ b/server/rooms/wagtail_hooks.py
@@ -17,7 +17,11 @@ from rooms.models import AdminGeneratedRoomSlug
 def do_after_page_edit(request, page):
     blocks = get_room_blocks(page)
     for block in blocks:
-        AdminGeneratedRoomSlug.objects.get_or_create(title=block[1]['title'])
+        if isinstance(block, tuple):
+            title = block[1]['title']
+        if isinstance(block, dict):
+            title = block['value']['title']
+        AdminGeneratedRoomSlug.objects.get_or_create(title=title)
 
 
 def get_room_blocks(page):
@@ -27,7 +31,11 @@ def get_room_blocks(page):
 
 
 def get_block_from_stream_data(stream_data, block_name):
-    return [block for block in stream_data if block[0] in [block_name]]
+    if isinstance(stream_data[0], tuple):
+        return [block for block in stream_data if block[0] in [block_name]]
+    if isinstance(stream_data[0], dict):
+        return [block for block in stream_data if block['type'] in [block_name]]
+    return []
 
 
 def get_admin_slugs_from_content_list(stream_data):