diff --git a/apps/app_jack.c b/apps/app_jack.c
index 46024ff392..10964f4621 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -904,8 +904,14 @@ static int enable_jack_hook(struct ast_channel *chan, char *data)
 return_error:
 	ast_channel_unlock(chan);
 
-	if (jack_data)
+	if (jack_data) {
 		destroy_jack_data(jack_data);
+	}
+
+	if (datastore) {
+		datastore->data = NULL;
+		ast_datastore_free(datastore);
+	}
 
 	return -1;
 }