diff --git a/sys/dev/mpr/mpr_mapping.c b/sys/dev/mpr/mpr_mapping.c
index 6d90c79efca..690e76249fe 100644
--- a/sys/dev/mpr/mpr_mapping.c
+++ b/sys/dev/mpr/mpr_mapping.c
@@ -2385,6 +2385,8 @@ fail:
 		 * sc->mapping_table volumes tooi
 		 */
 	}
+	for (enc_idx = 0; enc_idx < sc->num_enc_table_entries; enc_idx++)
+		_mapping_clear_enc_entry(sc->enclosure_table + enc_idx);
 	sc->num_enc_table_entries = 0;
 	return (false);
 }