diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
index b05bca24a1..f8d0b54174 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
@@ -193,6 +193,8 @@ public class HostNode extends DisplayableItemNode {
             }
         }
     };
+    
+    private final PropertyChangeListener weakPcl = WeakListeners.propertyChange(hostChangePcl, null);
 
     /*
      * Get the host name or 'unknown host' if null.
@@ -251,8 +253,7 @@ public class HostNode extends DisplayableItemNode {
                 host == null ? Lookups.fixed(displayName) : Lookups.fixed(host, displayName));
                 
         hostId = host == null ? null : host.getHostId();
-        Case.addEventTypeSubscriber(EnumSet.of(Case.Events.HOSTS_UPDATED),
-                WeakListeners.propertyChange(hostChangePcl, this));
+        Case.addEventTypeSubscriber(EnumSet.of(Case.Events.HOSTS_UPDATED), weakPcl);
         super.setName(displayName);
         super.setDisplayName(displayName);
         this.setIconBaseWithExtension(ICON_PATH);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/PersonNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/PersonNode.java
index a6cd30b115..310fe7a350 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/PersonNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/PersonNode.java
@@ -177,6 +177,8 @@ public class PersonNode extends DisplayableItemNode {
             }
         }
     };
+    
+    private final PropertyChangeListener weakPcl = WeakListeners.propertyChange(personChangePcl, null);
 
     /**
      * Gets the display name for this person or "Unknown Persons".
@@ -214,8 +216,7 @@ public class PersonNode extends DisplayableItemNode {
         this.setIconBaseWithExtension(ICON_PATH);
         this.person = person;
         this.personId = person == null ? null : person.getPersonId();
-        Case.addEventTypeSubscriber(EnumSet.of(Case.Events.PERSONS_UPDATED),
-                WeakListeners.propertyChange(personChangePcl, this));
+        Case.addEventTypeSubscriber(EnumSet.of(Case.Events.PERSONS_UPDATED), weakPcl);
     }
 
     @Override