diff --git a/packages/host/app/components/ai-assistant/panel.gts b/packages/host/app/components/ai-assistant/panel.gts
index d5175746de..cd976da5b5 100644
--- a/packages/host/app/components/ai-assistant/panel.gts
+++ b/packages/host/app/components/ai-assistant/panel.gts
@@ -188,11 +188,14 @@ export default class AiAssistantPanel extends Component<Signature> {
           </div>
         {{else if this.isReady}}
           {{! below if statement is covered in 'isReady' check above but added due to glint not realizing it }}
-          {{#if this.matrixService.currentRoomId}}
-            <Room
-              @roomId={{this.matrixService.currentRoomId}}
-              @monacoSDK={{this.monacoSDK}}
-            />
+          {{#if this.roomResource}}
+            {{#if this.matrixService.currentRoomId}}
+              <Room
+                @roomId={{this.matrixService.currentRoomId}}
+                @roomResource={{this.roomResource}}
+                @monacoSDK={{this.monacoSDK}}
+              />
+            {{/if}}
           {{/if}}
         {{else}}
           <LoadingIndicator
diff --git a/packages/host/app/components/matrix/room.gts b/packages/host/app/components/matrix/room.gts
index 3ccde8d910..01dc0bbc92 100644
--- a/packages/host/app/components/matrix/room.gts
+++ b/packages/host/app/components/matrix/room.gts
@@ -39,7 +39,7 @@ import UpdateSkillActivationCommand from '@cardstack/host/commands/update-skill-
 import { Message } from '@cardstack/host/lib/matrix-classes/message';
 import type { StackItem } from '@cardstack/host/lib/stack-item';
 import { getAutoAttachment } from '@cardstack/host/resources/auto-attached-card';
-import { getRoom } from '@cardstack/host/resources/room';
+import { RoomResource } from '@cardstack/host/resources/room';
 
 import type CardService from '@cardstack/host/services/card-service';
 import type CommandService from '@cardstack/host/services/command-service';
@@ -67,6 +67,7 @@ import type { Skill } from '../ai-assistant/skill-menu';
 interface Signature {
   Args: {
     roomId: string;
+    roomResource: RoomResource;
     monacoSDK: MonacoSDK;
   };
 }
@@ -78,7 +79,7 @@ export default class Room extends Component<Signature> {
         class='room'
         data-room-settled={{this.doWhenRoomChanges.isIdle}}
         data-test-room-settled={{this.doWhenRoomChanges.isIdle}}
-        data-test-room-name={{this.roomResource.name}}
+        data-test-room-name={{@roomResource.name}}
         data-test-room={{@roomId}}
       >
         <AiAssistantConversation
@@ -149,10 +150,10 @@ export default class Room extends Component<Signature> {
                 @filesToAttach={{this.filesToAttach}}
               />
               <LLMSelect
-                @selected={{this.roomResource.activeLLM}}
-                @onChange={{this.roomResource.activateLLM}}
+                @selected={{@roomResource.activeLLM}}
+                @onChange={{@roomResource.activateLLM}}
                 @options={{this.supportedLLMs}}
-                @disabled={{this.roomResource.isActivatingLLM}}
+                @disabled={{@roomResource.isActivatingLLM}}
               />
             </div>
           </div>
@@ -215,11 +216,6 @@ export default class Room extends Component<Signature> {
   @service private declare operatorModeStateService: OperatorModeStateService;
   @service private declare loaderService: LoaderService;
 
-  private roomResource = getRoom(
-    this,
-    () => this.args.roomId,
-    () => this.matrixService.getRoomData(this.args.roomId)?.events,
-  );
   private autoAttachmentResource = getAutoAttachment(
     this,
     () => this.topMostStackItems,
@@ -515,25 +511,25 @@ export default class Room extends Component<Signature> {
   };
 
   private isDisplayingCode = (message: Message) => {
-    return this.roomResource?.isDisplayingCode(message);
+    return this.args.roomResource.isDisplayingCode(message);
   };
 
   private toggleViewCode = (message: Message) => {
-    this.roomResource.toggleViewCode(message);
+    this.args.roomResource.toggleViewCode(message);
   };
 
   private doMatrixEventFlush = restartableTask(async () => {
     await this.matrixService.flushMembership;
     await this.matrixService.flushTimeline;
-    await this.roomResource.loading;
+    await this.args.roomResource.loading;
   });
 
   private get messages() {
-    return this.roomResource.messages;
+    return this.args.roomResource.messages;
   }
 
   private get skills(): Skill[] {
-    return this.roomResource.skills;
+    return this.args.roomResource.skills;
   }
 
   private get supportedLLMs(): string[] {
@@ -551,7 +547,7 @@ export default class Room extends Component<Signature> {
   }
 
   private get room() {
-    let room = this.roomResource.matrixRoom;
+    let room = this.args.roomResource.matrixRoom;
     return room;
   }