diff --git a/src/audio/module_adapter/module/generic.c b/src/audio/module_adapter/module/generic.c
index f77377a54cea..82d3188c28b5 100644
--- a/src/audio/module_adapter/module/generic.c
+++ b/src/audio/module_adapter/module/generic.c
@@ -71,10 +71,20 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
 	return ret;
 }
 
+static void mod_resource_init(struct processing_module *mod)
+{
+	struct module_data *md = &mod->priv;
+	/* Init memory list */
+	list_init(&md->resources.res_list);
+	list_init(&md->resources.free_cont_list);
+	list_init(&md->resources.cont_chunk_list);
+	md->resources.heap_usage = 0;
+	md->resources.heap_high_water_mark = 0;
+}
+
 int module_init(struct processing_module *mod)
 {
 	int ret;
-	struct module_data *md = &mod->priv;
 	struct comp_dev *dev = mod->dev;
 	const struct module_interface *const interface = dev->drv->adapter_ops;
 
@@ -99,14 +109,9 @@ int module_init(struct processing_module *mod)
 		return -EIO;
 	}
 
-	/* Init memory list */
-	list_init(&md->resources.res_list);
-	list_init(&md->resources.free_cont_list);
-	list_init(&md->resources.cont_chunk_list);
-	md->resources.heap_usage = 0;
-	md->resources.heap_high_water_mark = 0;
+	mod_resource_init(mod);
 #if CONFIG_MODULE_MEMORY_API_DEBUG && defined(__ZEPHYR__)
-	md->resources.rsrc_mngr = k_current_get();
+	mod->priv.resources.rsrc_mngr = k_current_get();
 #endif
 	/* Now we can proceed with module specific initialization */
 	ret = interface->init(mod);
@@ -117,7 +122,7 @@ int module_init(struct processing_module *mod)
 
 	comp_dbg(dev, "done");
 #if CONFIG_IPC_MAJOR_3
-	md->state = MODULE_INITIALIZED;
+	mod->priv.state = MODULE_INITIALIZED;
 #endif
 
 	return 0;
@@ -594,6 +599,13 @@ void mod_free_all(struct processing_module *mod)
 		list_item_del(&container->list);
 	}
 
+	list_for_item_safe(list, _list, &res->free_cont_list) {
+		struct module_resource *container =
+			container_of(list, struct module_resource, list);
+
+		list_item_del(&container->list);
+	}
+
 	list_for_item_safe(list, _list, &res->cont_chunk_list) {
 		struct container_chunk *chunk =
 			container_of(list, struct container_chunk, chunk_list);
@@ -601,6 +613,9 @@ void mod_free_all(struct processing_module *mod)
 		list_item_del(&chunk->chunk_list);
 		rfree(chunk);
 	}
+
+	/* Make sure resource lists and accounting are reset */
+	mod_resource_init(mod);
 }
 EXPORT_SYMBOL(mod_free_all);