diff --git a/client/common/file.c b/client/common/file.c
index dc0828cb0..db0eee592 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -1685,12 +1685,16 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s
 	if (intsize < 0)
 		return 0;
 	totalSize += (size_t)intsize;
+	if (buffer)
+		buffer += intsize;
 
 	/* string parameters */
 	const SSIZE_T stringsize = write_string_parameters(file, buffer, size);
 	if (stringsize < 0)
 		return 0;
 	totalSize += (size_t)stringsize;
+	if (buffer)
+		buffer += stringsize;
 
 	/* custom parameters */
 	const SSIZE_T customsize = write_custom_parameters(file, buffer, size);