diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 21e466fb3b930f0cb2c069150d67a7cac8881f2a..faa665789dc7173454f8a64f7105b484f5dba0f8 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -446,6 +446,8 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
 		if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, NULL))) {
 			ast_channel_datastore_remove(chan, datastore);
 			/* chanspy_ds->chan is NULL after this call */
+			chanspy_ds_destroy(datastore->data);
+			datastore->data = NULL;
 			ast_channel_datastore_free(datastore);
 		}
 		ast_channel_unlock(chan);