diff --git a/packages/common/index.ts b/packages/common/index.ts
index c5756a6eb..eea303dd5 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -989,7 +989,15 @@ export enum QueueTypes {
 export enum ExtraTAStatus {
   HELPING_IN_ANOTHER_QUEUE = 'Helping student in another queue',
   HELPING_IN_ANOTHER_COURSE = 'Helping student in another course',
+  AWAY = 'Away',
 }
+
+export class SetTAExtraStatusParams {
+  @IsOptional()
+  @IsEnum(ExtraTAStatus)
+  status?: ExtraTAStatus | null
+}
+
 export interface StaffMember {
   id: number
   name: string
@@ -1087,6 +1095,7 @@ export type StaffForStaffList = {
   name: string
   photoURL?: string
   questionHelpedAt?: Date
+  extraStatus?: ExtraTAStatus
 }
 
 // Represents a list of office hours wait times of each hour of the week.
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/QueueInfoColumn.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/QueueInfoColumn.tsx
index 681dda88d..ed23f8263 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/QueueInfoColumn.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/QueueInfoColumn.tsx
@@ -10,7 +10,7 @@ import {
   UpOutlined,
   EnvironmentOutlined,
 } from '@ant-design/icons'
-import { Button, Popconfirm, Row, Switch, Tooltip } from 'antd'
+import { Button, Popconfirm, Row, Switch, Tooltip, message } from 'antd'
 import moment from 'moment'
 import React, { ReactNode, useState } from 'react'
 import { useQueue } from '@/app/hooks/useQueue'
@@ -28,7 +28,11 @@ import RenderEvery from '@/app/components/RenderEvery'
 import TagGroupSwitch from './TagGroupSwitch'
 import StaffList from './StaffList'
 import { getQueueTypeLabel } from '../utils/commonQueueFunctions'
-import { QueuePartial, GetQueueChatsResponse } from '@koh/common'
+import { QueuePartial, GetQueueChatsResponse, ExtraTAStatus } from '@koh/common'
+import { useUserInfo } from '@/app/contexts/userContext'
+import { API } from '@/app/api'
+import { getErrorMessage } from '@/app/utils/generalUtils'
+import { useMediaQuery } from '@/app/hooks/useMediaQuery'
 
 interface QueueInfoColumnProps {
   cid: number
@@ -58,15 +62,26 @@ const QueueInfoColumn: React.FC<QueueInfoColumnProps> = ({
   queueChats,
 }) => {
   const router = useRouter()
+  const { userInfo } = useUserInfo()
+  const isMobile = useMediaQuery('(max-width: 768px)')
 
-  // const [away, setAway] = useState(false);
-  // const checkAway = (checked: boolean) => {
-  //   if (!checked) {
-  //     setAway(true);
-  //   } else {
-  //     setAway(false);
-  //   }
-  // };
+  const me = queue?.staffList?.find((s) => s.id === userInfo?.id)
+  const isAway = me?.extraStatus === ExtraTAStatus.AWAY
+  const [savingAway, setSavingAway] = useState(false)
+  const awaySwitchId = `away-switch-${queueId}`
+  const toggleAway = async (checked: boolean) => {
+    // checked = Away; unchecked = Answering
+    const newStatus = checked ? ExtraTAStatus.AWAY : null
+    try {
+      setSavingAway(true)
+      await API.taStatus.setExtraStatus(cid, queueId, newStatus)
+    } catch (err) {
+      const errorMessage = getErrorMessage(err)
+      message.error(errorMessage)
+    } finally {
+      setSavingAway(false)
+    }
+  }
   return (
     <div className="relative flex flex-shrink-0 flex-col pb-1 md:mt-8 md:w-72 md:pb-7">
       {/* only show the queue title and warning here on desktop, it's moved further down on mobile (and placed in queue page.tsx) */}
@@ -116,8 +131,23 @@ const QueueInfoColumn: React.FC<QueueInfoColumnProps> = ({
         {buttons}
       </div>
 
-      <div className="flex md:mt-3">
+      <div className="flex items-center justify-between md:mt-3">
         <h3 className="mb-0 text-2xl font-semibold">Staff</h3>
+        {isStaff && (
+          <div className="ml-auto flex items-center gap-2">
+            <label htmlFor={awaySwitchId} className="text-sm text-zinc-600">
+              Away
+            </label>
+
+            <Switch
+              id={awaySwitchId}
+              size={isMobile ? 'small' : undefined}
+              checked={isAway}
+              onChange={toggleAway}
+              loading={savingAway}
+            />
+          </div>
+        )}
         {/* Button to hide staff list on mobile */}
         <Button
           className="md:hidden"
@@ -147,13 +177,6 @@ const QueueInfoColumn: React.FC<QueueInfoColumnProps> = ({
       {isStaff && (
         // "Clear Queue" and "Delete Queue" buttons for DESKTOP ONLY - mobile is in EditQueueModal.tsx
         <div className="bottom-0 hidden h-full w-full flex-col justify-end text-white md:flex">
-          {/* <p>Toggle to indicate away </p>
-            <Switch
-              onChange={checkAway}
-              checkedChildren="Answering"
-              unCheckedChildren="Away"
-              style={{ width: "200px", marginTop: "-50px", marginBottom: "50px" }}
-            /> */}
           <Popconfirm
             title={
               'Are you sure you want to clear all students from the queue?'
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/StaffList.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/StaffList.tsx
index 183ec81d6..f39a0f5b2 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/StaffList.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/StaffList.tsx
@@ -96,6 +96,7 @@ interface StatusCardProps {
   studentName?: string
   helpedAt?: Date
   grouped?: boolean
+  isForPublic?: boolean // true for queue invite page
 }
 /**
  * View component just renders TA status
@@ -110,6 +111,7 @@ const StatusCard: React.FC<StatusCardProps> = ({
   studentName,
   helpedAt,
   grouped,
+  isForPublic,
 }) => {
   const isBusy = !!helpedAt || !!ta.extraStatus
   const [canSave, setCanSave] = useState(false)
@@ -182,8 +184,21 @@ const StatusCard: React.FC<StatusCardProps> = ({
           <Row justify="space-between">
             <div className="font-bold text-gray-900">{ta.name}</div>
             <span>
-              <Badge status={isBusy ? 'processing' : 'success'} />
-              {isBusy ? 'Busy' : 'Available'}
+              <Badge
+                className="mr-0.5"
+                status={
+                  ta.extraStatus === ExtraTAStatus.AWAY
+                    ? 'error'
+                    : isBusy
+                      ? 'processing'
+                      : 'success'
+                }
+              />
+              {ta.extraStatus === ExtraTAStatus.AWAY
+                ? 'Away'
+                : isBusy
+                  ? 'Busy'
+                  : 'Available'}
             </span>
           </Row>
           <div className="flex items-start justify-between">
@@ -196,13 +211,15 @@ const StatusCard: React.FC<StatusCardProps> = ({
                   helpedAt={helpedAt}
                   extraTAStatus={ta.extraStatus}
                 />
+              ) : ta.extraStatus === ExtraTAStatus.AWAY ? (
+                'Will be back soon'
               ) : (
                 // this 1 dot is enough to make the button wrap onto the next row, so i'm only showing it as "..." if there's no button (it looks weird if it's still "..")
                 'Looking for my next student..' + (isStaff ? '.' : '')
               )}
             </div>
             {/* Students have a button to message their TAs */}
-            {!isStaff && queueId && (
+            {!isForPublic && !isStaff && queueId && (
               <MessageButton
                 recipientName={ta.name}
                 staffId={ta.id}
diff --git a/packages/frontend/app/api/index.ts b/packages/frontend/app/api/index.ts
index 28031576f..d485c4feb 100644
--- a/packages/frontend/app/api/index.ts
+++ b/packages/frontend/app/api/index.ts
@@ -88,6 +88,7 @@ import {
   QueueInviteParams,
   QueuePartial,
   QueueTypes,
+  ExtraTAStatus,
   RemoveLMSOrganizationParams,
   Role,
   SemesterPartial,
@@ -720,6 +721,17 @@ class APIClient {
         return this.req('DELETE', `/api/v1/courses/${courseId}/checkout_all`)
       }
     },
+    setExtraStatus: async (
+      courseId: number,
+      qid: number,
+      status: ExtraTAStatus | null,
+    ): Promise<void> =>
+      this.req(
+        'PATCH',
+        `/api/v1/courses/${courseId}/ta_status/${qid}`,
+        undefined,
+        { status },
+      ),
   }
   asyncQuestions = {
     get: async (cid: number): Promise<AsyncQuestion[]> =>
diff --git a/packages/frontend/app/qi/[qid]/page.tsx b/packages/frontend/app/qi/[qid]/page.tsx
index 6785b413f..cad6938aa 100644
--- a/packages/frontend/app/qi/[qid]/page.tsx
+++ b/packages/frontend/app/qi/[qid]/page.tsx
@@ -347,6 +347,7 @@ export default function QueueInvitePage(
                       queueId={queueInviteInfo.queueId}
                       ta={ta}
                       helpedAt={ta.questionHelpedAt}
+                      isForPublic
                     />
                   ))}
                 </div>
diff --git a/packages/server/migration/20251112000100-AddTAAwayEvents.ts b/packages/server/migration/20251112000100-AddTAAwayEvents.ts
new file mode 100644
index 000000000..258e29139
--- /dev/null
+++ b/packages/server/migration/20251112000100-AddTAAwayEvents.ts
@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddTAAwayEvents20251112000100 implements MigrationInterface {
+  name = 'AddTAAwayEvents20251112000100';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TYPE "public"."event_model_eventtype_enum" RENAME TO "event_model_eventtype_enum_old"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "event_model_eventtype_enum" AS ENUM('taCheckedIn', 'taCheckedOut', 'taCheckedOutForced', 'taCheckedOutEventEnd', 'taMarkedSelfAway', 'taMarkedSelfBack')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "event_model" ALTER COLUMN "eventType" TYPE "event_model_eventtype_enum" USING "eventType"::"text"::"event_model_eventtype_enum"`,
+    );
+    await queryRunner.query(`DROP TYPE "event_model_eventtype_enum_old"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TYPE "event_model_eventtype_enum_old" AS ENUM('taCheckedIn', 'taCheckedOut', 'taCheckedOutForced', 'taCheckedOutEventEnd')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "event_model" ALTER COLUMN "eventType" TYPE "event_model_eventtype_enum_old" USING "eventType"::"text"::"event_model_eventtype_enum_old"`,
+    );
+    await queryRunner.query(`DROP TYPE "event_model_eventtype_enum"`);
+    await queryRunner.query(
+      `ALTER TYPE "event_model_eventtype_enum_old" RENAME TO  "event_model_eventtype_enum"`,
+    );
+  }
+}
diff --git a/packages/server/ormconfig.ts b/packages/server/ormconfig.ts
index 3e5d8daa7..2a8c78102 100644
--- a/packages/server/ormconfig.ts
+++ b/packages/server/ormconfig.ts
@@ -34,6 +34,7 @@ import { ApplicationConfigModel } from './src/config/application_config.entity';
 import { InsightDashboardModel } from './src/insights/dashboard.entity';
 import { QueueInviteModel } from './src/queue/queue-invite.entity';
 import { QueueChatsModel } from './src/queueChats/queue-chats.entity';
+import { QueueStaffModel } from './src/queue/queue-staff.entity';
 import { LMSOrganizationIntegrationModel } from './src/lmsIntegration/lmsOrgIntegration.entity';
 import { LMSCourseIntegrationModel } from './src/lmsIntegration/lmsCourseIntegration.entity';
 import { LMSAssignmentModel } from './src/lmsIntegration/lmsAssignment.entity';
@@ -113,6 +114,7 @@ const typeorm: DataSourceOptions = {
     ApplicationConfigModel,
     QueueInviteModel,
     QueueChatsModel,
+    QueueStaffModel,
     InsightDashboardModel,
     LMSOrganizationIntegrationModel,
     LMSCourseIntegrationModel,
diff --git a/packages/server/src/course/course.controller.ts b/packages/server/src/course/course.controller.ts
index bcd12a476..f22d3142c 100644
--- a/packages/server/src/course/course.controller.ts
+++ b/packages/server/src/course/course.controller.ts
@@ -21,6 +21,7 @@ import {
   UserCourse,
   UserTiny,
   validateQueueConfigInput,
+  SetTAExtraStatusParams,
 } from '@koh/common';
 import {
   BadRequestException,
@@ -592,6 +593,51 @@ export class CourseController {
     return { queueId: queue.id };
   }
 
+  /**
+   * Allows a TA to set or clear their extra status (e.g., Away) for a specific queue.
+   */
+  @Patch(':id/ta_status/:qid')
+  @UseGuards(JwtAuthGuard, CourseRolesGuard, EmailVerifiedGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async setTAExtraStatus(
+    @Param('id', ParseIntPipe) courseId: number,
+    @Param('qid', ParseIntPipe) queueId: number,
+    @User() user: UserModel,
+    @Body() body: SetTAExtraStatusParams,
+  ): Promise<void> {
+    const queue = await QueueModel.findOne({
+      where: {
+        id: queueId,
+        isDisabled: false,
+      },
+      relations: {
+        staffList: true,
+      },
+    });
+
+    if (!queue) {
+      throw new NotFoundException(
+        ERROR_MESSAGES.courseController.queueNotFound,
+      );
+    }
+
+    // Only allow if the user is checked into this queue
+    const isInStaffList = queue.staffList.some((s) => s.id === user.id);
+    if (!isInStaffList) {
+      throw new BadRequestException('You must be checked in to set status');
+    }
+
+    await this.courseService.setTAExtraStatusForQueue(
+      queueId,
+      courseId,
+      user.id,
+      body?.status ?? null,
+    );
+
+    await this.queueSSEService.updateQueue(queueId);
+    return;
+  }
+
   @Delete(':id/checkout_all')
   @UseGuards(JwtAuthGuard, CourseRolesGuard, EmailVerifiedGuard)
   @Roles(Role.PROFESSOR, Role.TA)
diff --git a/packages/server/src/course/course.service.ts b/packages/server/src/course/course.service.ts
index 7fd51a550..e2dccdb17 100644
--- a/packages/server/src/course/course.service.ts
+++ b/packages/server/src/course/course.service.ts
@@ -14,6 +14,7 @@ import {
   TACheckinTimesResponse,
   UserCourse,
   UserPartial,
+  ExtraTAStatus,
 } from '@koh/common';
 import {
   BadRequestException,
@@ -43,6 +44,7 @@ import { QuestionTypeModel } from 'questionType/question-type.entity';
 import { QueueModel } from 'queue/queue.entity';
 import { SuperCourseModel } from './super-course.entity';
 import { ChatbotDocPdfModel } from 'chatbot/chatbot-doc-pdf.entity';
+import { QueueStaffModel } from 'queue/queue-staff.entity';
 import * as crypto from 'crypto';
 
 @Injectable()
@@ -125,6 +127,57 @@ export class CourseService {
     return { taCheckinTimes };
   }
 
+  async setTAExtraStatusForQueue(
+    queueId: number,
+    courseId: number,
+    userId: number,
+    status: ExtraTAStatus | null,
+  ): Promise<void> {
+    const allowedStatuses: Array<ExtraTAStatus | null> = [
+      ExtraTAStatus.AWAY,
+      null,
+    ];
+    if (!allowedStatuses.includes(status ?? null)) {
+      throw new BadRequestException('Invalid status');
+    }
+
+    const joinRow = await QueueStaffModel.findOne({
+      where: { queueModelId: queueId, userModelId: userId },
+    });
+    if (!joinRow) {
+      // If the row doesn't exist, something is out of sync; bail
+      throw new BadRequestException('Unable to set status');
+    }
+
+    const prev = joinRow.extraTAStatus;
+    joinRow.extraTAStatus = status ?? null;
+    await joinRow.save();
+
+    if (
+      prev !== ExtraTAStatus.AWAY &&
+      joinRow.extraTAStatus === ExtraTAStatus.AWAY
+    ) {
+      await EventModel.create({
+        time: new Date(),
+        eventType: EventType.TA_MARKED_SELF_AWAY,
+        userId,
+        courseId,
+        queueId,
+      }).save();
+    } else if (
+      prev === ExtraTAStatus.AWAY &&
+      (joinRow.extraTAStatus === null || joinRow.extraTAStatus === undefined)
+    ) {
+      await EventModel.create({
+        time: new Date(),
+        eventType: EventType.TA_MARKED_SELF_BACK,
+        userId,
+        courseId,
+        queueId,
+      }).save();
+    }
+  }
+
   async removeUserFromCourse(userCourse: UserCourseModel): Promise<void> {
     if (!userCourse) {
       throw new HttpException(
diff --git a/packages/server/src/profile/event-model.entity.ts b/packages/server/src/profile/event-model.entity.ts
index ea453a177..3b3f27877 100644
--- a/packages/server/src/profile/event-model.entity.ts
+++ b/packages/server/src/profile/event-model.entity.ts
@@ -19,6 +19,8 @@ export enum EventType {
   TA_CHECKED_OUT = 'taCheckedOut',
   TA_CHECKED_OUT_FORCED = 'taCheckedOutForced',
   TA_CHECKED_OUT_EVENT_END = 'taCheckedOutEventEnd',
+  TA_MARKED_SELF_AWAY = 'taMarkedSelfAway',
+  TA_MARKED_SELF_BACK = 'taMarkedSelfBack',
 }
 
 @Entity('event_model')
diff --git a/packages/server/src/profile/user.entity.ts b/packages/server/src/profile/user.entity.ts
index 192f34388..75d4e9a20 100644
--- a/packages/server/src/profile/user.entity.ts
+++ b/packages/server/src/profile/user.entity.ts
@@ -89,6 +89,11 @@ export class UserModel extends BaseEntity {
   @Exclude()
   subscriptions: UserSubscriptionModel[];
 
+  // NOTE: This relation uses a JoinTable and is also mapped by QueueStaffModel
+  // to store extra metadata (e.g., extra TA status) on the join row without
+  // refactoring all code that expects queues: QueueModel[]. If you need to
+  // modify attributes on the join table itself, do so via QueueStaffModel. Note said attributes
+  // will not appear on this queues array and you will need to query them directly via QueueStaffModel.find(...)
   @Exclude()
   @ManyToMany((type) => QueueModel, (queue) => queue.staffList)
   queues: QueueModel[];
diff --git a/packages/server/src/queue/queue-staff.entity.ts b/packages/server/src/queue/queue-staff.entity.ts
new file mode 100644
index 000000000..54aed1293
--- /dev/null
+++ b/packages/server/src/queue/queue-staff.entity.ts
@@ -0,0 +1,34 @@
+import {
+  BaseEntity,
+  Column,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryColumn,
+} from 'typeorm';
+import { QueueModel } from './queue.entity';
+import { UserModel } from '../profile/user.entity';
+import { ExtraTAStatus } from '@koh/common';
+
+// Map the existing join table used by the ManyToMany relation between QueueModel.staffList and UserModel.queues
+// This allows us to store additional metadata for a TA's status within a queue without refactoring all relations.
+@Entity('queue_model_staff_list_user_model')
+export class QueueStaffModel extends BaseEntity {
+  @PrimaryColumn('int', { name: 'queueModelId' })
+  queueModelId: number;
+
+  @PrimaryColumn('int', { name: 'userModelId' })
+  userModelId: number;
+
+  @ManyToOne(() => QueueModel, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'queueModelId' })
+  queue: QueueModel;
+
+  @ManyToOne(() => UserModel, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'userModelId' })
+  user: UserModel;
+
+  // Optional extra status a TA can set for themselves (e.g., Away)
+  @Column({ type: 'enum', enum: ExtraTAStatus, nullable: true })
+  extraTAStatus: ExtraTAStatus | null;
+}
diff --git a/packages/server/src/queue/queue.entity.ts b/packages/server/src/queue/queue.entity.ts
index a9b82c29d..e387cdb56 100644
--- a/packages/server/src/queue/queue.entity.ts
+++ b/packages/server/src/queue/queue.entity.ts
@@ -52,6 +52,11 @@ export class QueueModel extends BaseEntity {
   @Column('text', { nullable: true })
   notes: string;
 
+  // NOTE: This relation uses a JoinTable and is also mapped by QueueStaffModel
+  // to store extra metadata (e.g., extra TA status) on the join row without
+  // refactoring all code that expects staffList: UserModel[]. If you need to
+  // modify attributes on the join table itself, do so via QueueStaffModel; Note said attributes
+  // will not appear on this queues array and you will need to query them directly via QueueStaffModel.find(...)
   @ManyToMany((type) => UserModel, (user) => user.queues)
   @JoinTable()
   staffList: UserModel[];
diff --git a/packages/server/src/queue/queue.service.ts b/packages/server/src/queue/queue.service.ts
index d3376f1f4..d60d11409 100644
--- a/packages/server/src/queue/queue.service.ts
+++ b/packages/server/src/queue/queue.service.ts
@@ -27,6 +27,7 @@ import { pick } from 'lodash';
 import { QuestionModel } from 'question/question.entity';
 import { DataSource, In } from 'typeorm';
 import { QueueModel } from './queue.entity';
+import { QueueStaffModel } from './queue-staff.entity';
 import { AlertsService } from '../alerts/alerts.service';
 import { ApplicationConfigService } from '../config/application_config.service';
 import { QuestionTypeModel } from 'questionType/question-type.entity';
@@ -64,10 +65,21 @@ export class QueueService {
     const StaffHelpingInOtherQueues =
       await this.getStaffHelpingInOtherQueues(queueId);
 
+    // load any self-set extra TA statuses for staff in this queue
+    const staffStatusRows = await QueueStaffModel.find({
+      where: { queueModelId: queueId },
+    });
+    const userIdToExtraStatus = new Map<number, ExtraTAStatus | null>();
+    staffStatusRows.forEach((row) =>
+      userIdToExtraStatus.set(row.userModelId, row.extraTAStatus ?? null),
+    );
+
     queue.staffList = queue.staffList.map((user) => {
       const staffHelpingInOtherQueue = StaffHelpingInOtherQueues.find(
         (staff) => staff.userId === user.id,
       );
+      // precedence: if user marked themselves away, show that; else show helping-in-other-* status
+      const selfExtra = userIdToExtraStatus.get(user.id);
       return {
         id: user.id,
         name: user.name,
@@ -75,13 +87,16 @@ export class QueueService {
         TANotes:
           user.courses.find((ucm) => ucm.courseId === queue.courseId)
             ?.TANotes ?? '',
-        extraStatus: !staffHelpingInOtherQueue
-          ? undefined
-          : staffHelpingInOtherQueue.courseId !== queue.courseId
-            ? ExtraTAStatus.HELPING_IN_ANOTHER_COURSE
-            : staffHelpingInOtherQueue.queueId !== queueId
-              ? ExtraTAStatus.HELPING_IN_ANOTHER_QUEUE
-              : undefined,
+        extraStatus:
+          selfExtra === ExtraTAStatus.AWAY
+            ? ExtraTAStatus.AWAY
+            : !staffHelpingInOtherQueue
+              ? undefined
+              : staffHelpingInOtherQueue.courseId !== queue.courseId
+                ? ExtraTAStatus.HELPING_IN_ANOTHER_COURSE
+                : staffHelpingInOtherQueue.queueId !== queueId
+                  ? ExtraTAStatus.HELPING_IN_ANOTHER_QUEUE
+                  : undefined,
         helpingStudentInAnotherQueueSince: staffHelpingInOtherQueue?.helpedAt,
       } as StaffMember as unknown as UserModel;
     });
@@ -587,6 +602,17 @@ export class QueueService {
 
     await queue.addQueueSize();
 
+    const staffHelpingInOtherQueues =
+      await this.getStaffHelpingInOtherQueues(queueId);
+
+    const staffStatusRows = await QueueStaffModel.find({
+      where: { queueModelId: queueId },
+    });
+    const userIdToExtraStatus = new Map<number, ExtraTAStatus | null>();
+    staffStatusRows.forEach((row) =>
+      userIdToExtraStatus.set(row.userModelId, row.extraTAStatus ?? null),
+    );
+
     // query the questions helped questions for this queue (select helpedAt and taHelpedId)
     const helpedQuestions = await QuestionModel.find({
       select: ['helpedAt', 'taHelpedId'],
@@ -605,6 +631,21 @@ export class QueueService {
         }
       });
 
+      const staffHelpingInOtherQueue = staffHelpingInOtherQueues.find(
+        (staff) => staff.userId === user.id,
+      );
+      const selfExtra = userIdToExtraStatus.get(user.id);
+      const extraStatus =
+        selfExtra === ExtraTAStatus.AWAY
+          ? ExtraTAStatus.AWAY
+          : !staffHelpingInOtherQueue
+            ? undefined
+            : staffHelpingInOtherQueue.courseId !== queue.courseId
+              ? ExtraTAStatus.HELPING_IN_ANOTHER_COURSE
+              : staffHelpingInOtherQueue.queueId !== queueId
+                ? ExtraTAStatus.HELPING_IN_ANOTHER_QUEUE
+                : undefined;
+
       return {
         id: user.id,
         name: user.name,
@@ -613,6 +654,7 @@ export class QueueService {
         TANotes:
           user.courses.find((ucm) => ucm.courseId === queue.courseId)
             ?.TANotes ?? '',
+        extraStatus,
       };
     });
 
diff --git a/packages/server/test/course.integration.ts b/packages/server/test/course.integration.ts
index 5456d5108..c7727c567 100644
--- a/packages/server/test/course.integration.ts
+++ b/packages/server/test/course.integration.ts
@@ -1,5 +1,6 @@
 import {
   ERROR_MESSAGES,
+  ExtraTAStatus,
   OrganizationRole,
   QuestionStatusKeys,
   Role,
@@ -34,6 +35,7 @@ import { CourseSettingsModel } from 'course/course_settings.entity';
 import { QuestionTypeModel } from 'questionType/question-type.entity';
 import { CourseService } from '../src/course/course.service';
 import { MailModule } from 'mail/mail.module';
+import { QueueStaffModel } from 'queue/queue-staff.entity';
 
 describe('Course Integration', () => {
   const { supertest } = setupIntegrationTest(CourseModule, undefined, [
@@ -546,6 +548,98 @@ describe('Course Integration', () => {
     });
   });
 
+  describe('PATCH /courses/:id/ta_status/:qid', () => {
+    it('returns 401 when the user is not logged in', async () => {
+      const queue = await QueueFactory.create();
+      await supertest()
+        .patch(`/courses/${queue.course.id}/ta_status/${queue.id}`)
+        .send({ status: ExtraTAStatus.AWAY })
+        .expect(401);
+    });
+
+    it('allows a checked-in TA to set and clear Away status', async () => {
+      const queue = await QueueFactory.create();
+      const ta = await UserFactory.create();
+      const tcf = await TACourseFactory.create({
+        course: queue.course,
+        user: ta,
+      });
+
+      // add TA to staff list for this queue
+      queue.staffList = [ta];
+      await queue.save();
+
+      await supertest({ userId: ta.id })
+        .patch(`/courses/${queue.course.id}/ta_status/${queue.id}`)
+        .send({ status: ExtraTAStatus.AWAY })
+        .expect(200);
+
+      const joinRow = await QueueStaffModel.findOne({
+        where: { queueModelId: queue.id, userModelId: ta.id },
+      });
+      expect(joinRow).toBeTruthy();
+      expect(joinRow.extraTAStatus).toBe(ExtraTAStatus.AWAY);
+
+      const eventsAway = await EventModel.find({
+        where: {
+          userId: ta.id,
+          courseId: queue.course.id,
+          queueId: queue.id,
+          eventType: EventType.TA_MARKED_SELF_AWAY,
+        },
+      });
+      expect(eventsAway.length).toBe(1);
+
+      await supertest({ userId: ta.id })
+        .patch(`/courses/${queue.course.id}/ta_status/${queue.id}`)
+        .send({ status: null })
+        .expect(200);
+
+      const joinRowCleared = await QueueStaffModel.findOne({
+        where: { queueModelId: queue.id, userModelId: ta.id },
+      });
+      expect(joinRowCleared.extraTAStatus).toBeNull();
+
+      const eventsBack = await EventModel.find({
+        where: {
+          userId: ta.id,
+          courseId: queue.course.id,
+          queueId: queue.id,
+          eventType: EventType.TA_MARKED_SELF_BACK,
+        },
+      });
+      expect(eventsBack.length).toBe(1);
+    });
+
+    it('returns 400 when TA is not checked into the queue', async () => {
+      const queue = await QueueFactory.create();
+      const ta = await UserFactory.create();
+      const tcf = await TACourseFactory.create({
+        course: queue.course,
+        user: ta,
+      });
+
+      await supertest({ userId: ta.id })
+        .patch(`/courses/${queue.course.id}/ta_status/${queue.id}`)
+        .send({ status: ExtraTAStatus.AWAY })
+        .expect(400);
+    });
+
+    it('returns 404 when the queue does not exist', async () => {
+      const course = await CourseFactory.create();
+      const ta = await UserFactory.create();
+      const tcf = await TACourseFactory.create({
+        course,
+        user: ta,
+      });
+
+      await supertest({ userId: ta.id })
+        .patch(`/courses/${course.id}/ta_status/9999`)
+        .send({ status: ExtraTAStatus.AWAY })
+        .expect(404);
+    });
+  });
+
   describe('POST /courses/:id/create_queue/:room', () => {
     it('correctly propagates notes,profq,and name', async () => {
       const ucp = await UserCourseFactory.create({