diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 24988f430e4b32d70e262ea7c08bc716c8698fd4..b81149eb26e5815c3e7d81cea341e140a03fae2b 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -2025,10 +2025,11 @@ static void nfs4_kill_super(struct super_block *sb)
 
 	if (server->client != NULL && !IS_ERR(server->client))
 		rpc_shutdown_client(server->client);
-	rpciod_down();		/* release rpciod */
 
 	destroy_nfsv4_state(server);
 
+	rpciod_down();
+
 	kfree(server->hostname);
 	kfree(server);
 }