diff --git a/client/src/graphql/gql/public-client/betaLogin.gql b/client/src/graphql/gql/public-client/betaLogin.gql
index 3275f77a..d13fee62 100644
--- a/client/src/graphql/gql/public-client/betaLogin.gql
+++ b/client/src/graphql/gql/public-client/betaLogin.gql
@@ -4,3 +4,4 @@ mutation BetaLogin($input: BetaLoginInput!) {
     message
   }
 }
+
diff --git a/server/api/graphene_wagtail.py b/server/api/graphene_wagtail.py
index 39786509..afb94e11 100644
--- a/server/api/graphene_wagtail.py
+++ b/server/api/graphene_wagtail.py
@@ -18,7 +18,9 @@ logger = logging.getLogger(__name__)
 class GenericStreamFieldType(Scalar):
     @staticmethod
     def serialize(stream_value):
-        raw_data = stream_value.raw_data
+        # todo: @django3-update
+        #raw_data = stream_value.raw_data
+        raw_data = stream_value.stream_data
         return list(augment_fields(raw_data))
 
 
diff --git a/server/books/schema/nodes/content.py b/server/books/schema/nodes/content.py
index 4de75eb8..aab2a06c 100644
--- a/server/books/schema/nodes/content.py
+++ b/server/books/schema/nodes/content.py
@@ -57,7 +57,9 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
 
     def resolve_contents(self, info, **kwargs):
         updated_raw_data = []
-        for content in self.contents.raw_data:
+        # todo: @django3-update
+        #for content in self.contents.raw_data:
+        for content in self.contents.stream_data:
             # only show solutions to teachers and students for whom their teachers have them enabled
             if is_solution_and_hidden_for_user(content['type'], info.context.user, self.module):
                 logger.debug('Solution is hidden for this user')
@@ -70,7 +72,9 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
             content = process_module_room_slug_block(content)
             updated_raw_data.append(content)
 
-        self.contents.raw_data = updated_raw_data
+        # todo: @django3-update
+        #self.contents.raw_data = updated_raw_data
+        self.contents.stream_data = updated_raw_data
         return self.contents
 
     def resolve_bookmarks(self, info, **kwargs):
diff --git a/server/rooms/wagtail_hooks.py b/server/rooms/wagtail_hooks.py
index 1a9e37be..07d97b45 100644
--- a/server/rooms/wagtail_hooks.py
+++ b/server/rooms/wagtail_hooks.py
@@ -28,8 +28,11 @@ def do_after_page_edit(request, page):
 
 
 def get_room_blocks(page):
-    top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
-    content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
+    # todo: @django3-update
+    #top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
+    #content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
+    top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.stream_data, 'module_room_slug')
+    content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.stream_data)
     return top_level_module_room_slug_blocks + content_list_module_room_slug_blocks