diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index d27797ebba..1d0acf446e 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -1273,7 +1273,10 @@ namespace OpenSim.Groups
 
             GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
             IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-            eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
+            if (eq != null)
+                eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
+            else
+                remoteClient.SendGroupMembership(membershipArray);
 
             remoteClient.RefreshGroupMembership();
         }