diff --git a/llvm/lib/VMCore/Metadata.cpp b/llvm/lib/VMCore/Metadata.cpp
index 208e1bcedccf..60ec1c5c6cab 100644
--- a/llvm/lib/VMCore/Metadata.cpp
+++ b/llvm/lib/VMCore/Metadata.cpp
@@ -101,8 +101,8 @@ static std::vector<Value*> getValType(MDNode *N) {
 }
 
 MDNode::~MDNode() {
-  dropAllReferences();
   getType()->getContext().pImpl->MDNodes.remove(this);
+  dropAllReferences();
 }
 
 //===----------------------------------------------------------------------===//