diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 6bed631005253620bd8fa95319b0f042a06a29c0..a1a270c724a9b8a5b5413166af09e71611bc1693 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -3840,9 +3840,10 @@ NdbDictionaryImpl::dropBlobEvents(const NdbEventImpl& evnt)
       if (! c.getBlobType() || c.getPartSize() == 0)
         continue;
       n--;
-      char bename[MAX_TAB_NAME_SIZE];
-      NdbBlob::getBlobEventName(bename, &evnt, &c);
-      (void)dropEvent(bename);
+      NdbEventImpl* blob_evnt = getBlobEvent(evnt, i);
+      if (blob_evnt == NULL)
+        continue;
+      (void)dropEvent(*blob_evnt);
     }
   } else {
     // loop over MAX_ATTRIBUTES_IN_TABLE ...