diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 47cb0ca2..3e669093 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -93,7 +93,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_WAIT);
 	}
 
-	file = server_client_get_path(c, path);
+	file = server_client_get_path(item->client, path);
 	free(path);
 
 	f = fopen(file, "rb");
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index 938bb3d6..3395612f 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -104,7 +104,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(self->args, 'a'))
 		flags = "ab";
 
-	file = server_client_get_path(c, path);
+	file = server_client_get_path(item->client, path);
 	free(path);
 
 	f = fopen(file, flags);