diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
index b69324b505..6f43eb0a22 100644
--- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
+++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
@@ -168,6 +168,7 @@ public class PointsToolLayer extends AbstractMovableToolLayer<Point> implements
         for (IFont font : fonts.values()) {
             font.dispose();
         }
+        fonts.clear();
         this.resourceData.removeChangeListener(this);
     }