diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48d38d227..428b84935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - PBAP CLient: support disconnect while operation is ongoing
 - PBAP Client: use SRM only if GOEP v2.0 or higher connection
+- PBAP Client: emit vCard entry data as PBAP_DATA_PACKET
 - L2CAP: limit remote MTU by local tx configuration in ERTM
 
 ### Changed
diff --git a/src/classic/pbap_client.c b/src/classic/pbap_client.c
index 1a445f22f..9876f2816 100644
--- a/src/classic/pbap_client.c
+++ b/src/classic/pbap_client.c
@@ -538,6 +538,7 @@ static void pbap_client_parser_callback_get_operation(void * user_data, uint8_t
         case OBEX_HEADER_END_OF_BODY:
             switch(pbap_client->state){
                 case PBAP_W4_PHONEBOOK:
+                case PBAP_W4_GET_CARD_ENTRY_COMPLETE:
                     client->client_handler(PBAP_DATA_PACKET, client->cid, (uint8_t *) data_buffer, data_len);
                     if (data_offset + data_len == total_len){
                         client->flow_wait_for_user = true;
@@ -546,9 +547,6 @@ static void pbap_client_parser_callback_get_operation(void * user_data, uint8_t
                 case PBAP_W4_GET_CARD_LIST_COMPLETE:
                     pbap_client_process_vcard_list_body(data_buffer, data_len);
                     break;
-                case PBAP_W4_GET_CARD_ENTRY_COMPLETE:
-                    // TODO: not implemented yet
-                    break;
                 default:
                     btstack_unreachable();
                     break;