diff --git a/client/src/components/GroupsPanel.jsx b/client/src/components/GroupsPanel.jsx
index e6f3b1f..849ff1f 100644
--- a/client/src/components/GroupsPanel.jsx
+++ b/client/src/components/GroupsPanel.jsx
@@ -33,7 +33,7 @@ const GroupsPanel = ({ turtles, apiUrl, wsUrl }) => {
       const response = await fetch(`${apiUrl}/api/groups`);
       if (response.ok) {
         const data = await response.json();
-        setGroups(data);
+        setGroups(Array.isArray(data) ? data : (data.groups || []));
       }
     } catch (error) {
       console.error('Failed to load groups:', error);