diff --git a/src/components/Attachment/Attachment.tsx b/src/components/Attachment/Attachment.tsx
index 588802028..902321629 100644
--- a/src/components/Attachment/Attachment.tsx
+++ b/src/components/Attachment/Attachment.tsx
@@ -186,7 +186,7 @@ const renderGroupedAttachments = ({
           />,
         );
       } else if (attachment.type === 'giphy') {
-        typeMap.card.push(
+        typeMap.giphy.push(
           <GiphyContainer
             key={`giphy-${typeMap.giphy.length}`}
             {...rest}
diff --git a/src/components/Attachment/__tests__/Attachment.test.tsx b/src/components/Attachment/__tests__/Attachment.test.tsx
index 4d1491f8a..e9f019a75 100644
--- a/src/components/Attachment/__tests__/Attachment.test.tsx
+++ b/src/components/Attachment/__tests__/Attachment.test.tsx
@@ -218,6 +218,37 @@ describe('attachment', () => {
         expect(imageElement.style.getPropertyValue('--original-width')).toBe('200');
       });
     });
+
+    it('should render multiple giphy attachments without duplicate keys', async () => {
+      const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => null);
+      const giphies = Array.from({ length: 3 }, generateGiphyAttachment);
+
+      renderComponent({ attachments: giphies });
+
+      await waitFor(() => {
+        expect(screen.getAllByTestId('giphy-attachment')).toHaveLength(giphies.length);
+      });
+      const duplicateKeyWarnings = consoleErrorSpy.mock.calls.filter(([message]) =>
+        String(message).includes('Encountered two children with the same key'),
+      );
+      expect(duplicateKeyWarnings).toHaveLength(0);
+      consoleErrorSpy.mockRestore();
+    });
+
+    it('should render giphy attachments in the giphy group, before cards', async () => {
+      const { container } = renderComponent({
+        attachments: [ATTACHMENTS.scraped.image, ATTACHMENTS.scraped.giphy],
+      });
+
+      await waitFor(() => {
+        const renderedTestIds = Array.from(
+          container.querySelectorAll(
+            '[data-testid="giphy-attachment"], [data-testid="card-attachment"]',
+          ),
+        ).map((element) => element.getAttribute('data-testid'));
+        expect(renderedTestIds).toEqual(['giphy-attachment', 'card-attachment']);
+      });
+    });
   });
 
   describe('combines scraped & uploaded content', () => {