CB-1953

Fix for the weird media behavior on callbacks as well as on the first execution.