diff --git a/bridge_context.go b/bridge_context.go
index 769672a..a549bd2 100644
--- a/bridge_context.go
+++ b/bridge_context.go
@@ -28,6 +28,8 @@ func (b *BridgeContext) GetOrCreateDCIDForJID(JID string) (uint32, error) {
 
 	if ok {
 		chatName = chat.Name
+	} else if sender, ok := b.WhappConn.Store.Contacts[JID]; ok {
+		chatName = sender.Name
 	}
 
 	DCID := b.DCContext.CreateGroupChat(true, chatName)