diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index f6cd485288..ff6494be44 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -153,9 +153,6 @@ struct client *client_create(int fd_in, int fd_out, const char *session_id,
 					     &client->output);
 	}
 
-	mail_namespaces_set_storage_callbacks(user->namespaces,
-					      &mail_storage_callbacks, client);
-
 	client->capability_string =
 		str_new(client->pool, sizeof(CAPABILITY_STRING)+64);
 
@@ -220,6 +217,8 @@ int client_create_finish(struct client *client, const char **error_r)
 {
 	if (mail_namespaces_init(client->user, error_r) < 0)
 		return -1;
+	mail_namespaces_set_storage_callbacks(client->user->namespaces,
+					      &mail_storage_callbacks, client);
 	return 0;
 }