diff --git a/deploy.manager.inc b/deploy.manager.inc
index 1f8e083..713c596 100644
--- a/deploy.manager.inc
+++ b/deploy.manager.inc
@@ -176,3 +176,22 @@ function deploy_node_revision_delete($node) {
     deploy_manager_delete_revision_from_plan($plan->name, 'node', $node);
   }
 }
+
+/**
+ * Return entity stored in deploy manager entity by id.
+ *
+ * @param $dme_id
+ *   The unique identifier for entity.
+ */
+function deploy_manager_entities_get_by_id($dme_id) {
+  $dme = (object)[];
+  if(isset($dme_id)){
+    $dme = db_select('deploy_manager_entities', 'dme')
+      ->fields('dme', array('dme_id','plan_name','entity_type','entity_id','revision_id'))
+      ->condition('dme.dme_id', $dme_id)
+      ->range(0, 1)
+      ->execute()
+      ->fetchObject();
+  }
+  return $dme;
+}
\ No newline at end of file
diff --git a/deploy.module b/deploy.module
index e237b40..92d96e5 100644
--- a/deploy.module
+++ b/deploy.module
@@ -739,6 +739,8 @@ function deploy_find_entity($entity_type, $entity_id, $exclude=NULL, $revision_i
  * Entity label callback.
  */
 function deploy_manager_entities_label($entity, $entity_type) {
+  $dme = deploy_manager_entities_get_by_id($entity->dme_id);
+  $entity->entity_type = $dme->entity_type;
   $plan_entity = deploy_plan_entity_load($entity->entity_type, $entity->entity_id, $entity->revision_id);
   return deploy_plan_entity_label($entity->entity_type, $plan_entity, $entity->revision_id);
 }
diff --git a/deploy.rules.inc b/deploy.rules.inc
index 5f544f7..deb7fd4 100644
--- a/deploy.rules.inc
+++ b/deploy.rules.inc
@@ -141,6 +141,8 @@ function deploy_manager_action_delete_from_plan($plan_name, $entity_wrapper) {
  *   The deploy manager entity to be deleted.
  */
 function deploy_manager_entity_remove($dme) {
+  $dme_entity = deploy_manager_entities_get_by_id($dme->dme_id);
+  $dme->entity_type = $dme_entity->entity_type;
   $label = $dme->label();
   $dme->delete();
   drupal_set_message(t('Entity has been removed: @label', ['@label' => $label]));