Fixed stream server saving (issue #2582)