diff --git a/mapfile.c b/mapfile.c
index a502556..8d7acb3 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -268,6 +268,7 @@ void map_remove(struct map_ent **mapp, char *devnm)
 	map_delete(mapp, devnm);
 	map_write(*mapp);
 	map_free(*mapp);
+	*mapp = NULL;
 }
 
 struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4])