diff --git a/www/form/GroupFilter.js b/www/form/GroupFilter.js
index 5c75f1d00..11aa24c4f 100644
--- a/www/form/GroupFilter.js
+++ b/www/form/GroupFilter.js
@@ -214,8 +214,11 @@ Ext.define('PBS.form.GroupFilter', {
 	me.setDsStoreUrl(url);
 	me.dsStore.load({
 	    callback: (records) => {
+		if (me.isDestroyed) {
+		    return;
+		}
 		me.query('pbsGroupSelector').forEach((selector) => {
-		    selector.getStore().setData(records);
+		    selector.getStore().setData(records || []);
 		});
 	    },
 	});