diff --git a/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java b/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
index 0c3fa8c8b7..621de103ec 100644
--- a/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
+++ b/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
@@ -637,6 +637,8 @@ public void updateTypesWithNoRefResolve(AtlasTypesDef typesDef) throws AtlasBase
         }
 
         public void removeTypesDef(AtlasTypesDef typesDef) throws AtlasBaseException {
+            resolveReferences();
+
             if (null != typesDef && !typesDef.isEmpty()) {
                 removeTypesWithNoRefResolve(typesDef.getEnumDefs());
                 removeTypesWithNoRefResolve(typesDef.getStructDefs());
@@ -646,7 +648,6 @@ public void removeTypesDef(AtlasTypesDef typesDef) throws AtlasBaseException {
                 removeTypesWithNoRefResolve(typesDef.getBusinessMetadataDefs());
             }
 
-            resolveReferences();
         }
 
         private void removeTypesWithNoRefResolve(Collection<? extends AtlasBaseTypeDef> typeDefs) {