diff --git a/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx b/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx
index 7b71b6dc..d7f9fec1 100644
--- a/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx
+++ b/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx
@@ -56,6 +56,7 @@ export const formatRooms = (roomIDs: number[]) => {
 const GroupTab = ({
   roomId,
   roomKey,
+  announcementGroup,
   firstAnnouncement,
   setSelectedGroup,
   isDraft,
@@ -63,6 +64,7 @@ const GroupTab = ({
 }: {
   roomId: string;
   roomKey: string;
+  announcementGroup: boolean;
   firstAnnouncement: NotificationResponse | null;
   setSelectedGroup: React.Dispatch<React.SetStateAction<string>>;
   isDraft: boolean;
@@ -103,7 +105,7 @@ const GroupTab = ({
         <Flex flexDir="column" w="100%">
           <Flex justifyContent="space-between">
             <Text as="b" color={isDraft ? "gray.500" : "black"}>
-              {formatRooms(rooms)}
+              {announcementGroup? 'All Rooms': formatRooms(rooms)}
             </Text>
             <Text margin="0" color="gray.500">
               {firstAnnouncement
@@ -187,6 +189,7 @@ const GroupList: React.FC<{
         addingNewRoom ? (
           <GroupTab
             key={null}
+            announcementGroup={false}
             roomId="0"
             roomKey="0"
             firstAnnouncement={null}
@@ -208,6 +211,7 @@ const GroupList: React.FC<{
           .map((group) => (
             <GroupTab
               key={group.id}
+              announcementGroup={group.announcementGroup}
               roomId={group.id}
               roomKey={
                 group.recipients
diff --git a/frontend/src/components/pages/announcements/AnnouncementsView.tsx b/frontend/src/components/pages/announcements/AnnouncementsView.tsx
index 693ff76c..e9fdd16a 100644
--- a/frontend/src/components/pages/announcements/AnnouncementsView.tsx
+++ b/frontend/src/components/pages/announcements/AnnouncementsView.tsx
@@ -141,7 +141,8 @@ const AnnouncementsView = ({
   sendNotification,
   createNotificationGroupAndSendNotification,
 }: Props): React.ReactElement => {
-  const rooms = selectedGroup.split(",").map(Number);
+  const groupInfo = announcements.find((group) => group.id === selectedGroup);
+  const rooms = groupInfo && groupInfo.recipients? groupInfo.recipients.map((recipient) => recipient.roomNumber): [];
   const [allRooms, setAllRooms] = useState([1, 2, 3, 4, 5, 6]);
 
   const addRoomToNewRoom = (roomId: number) => {
@@ -208,6 +209,16 @@ const AnnouncementsView = ({
     return "All Rooms";
   };
 
+  const getHeader = () => {
+    if (selectedGroup === "" || selectedGroup === "0") {
+      return formatHeader(rooms);
+    } 
+    if (groupInfo?.announcementGroup) {
+      return 'All Rooms';
+    } 
+    return formatRooms(rooms);
+  }
+
   return (
     <Box h="100vh" w="100%">
       <Flex align="left" flexDir="column" h="100%">
@@ -221,9 +232,7 @@ const AnnouncementsView = ({
           h="10vh"
         >
           <h1 style={{ fontSize: "24px", margin: "0" }}>
-            {selectedGroup === "" || selectedGroup === "0"
-              ? formatHeader(rooms)
-              : formatRooms(rooms)}
+            {getHeader()}
           </h1>
           <IconButton
             aria-label="info"