diff --git a/lib/mongodb.ts b/lib/mongodb.ts
index 7935fd6..86f3c9d 100644
--- a/lib/mongodb.ts
+++ b/lib/mongodb.ts
@@ -7,27 +7,24 @@ if (!process.env.MONGODB_URI) {
 const uri = process.env.MONGODB_URI;
 const options = {};
 
-let client;
-let clientPromise: Promise<mongoclient>;
+let client: MongoClient;
 
 if (process.env.NODE_ENV === "development") {
 // In development mode, use a global variable so that the value
 // is preserved across module reloads caused by HMR (Hot Module Replacement).
 let globalWithMongo = global as typeof globalThis & {
- _mongoClientPromise?: Promise<mongoclient>;
+ _mongoClient?: MongoClient;
 };
 
- if (!globalWithMongo._mongoClientPromise) {
- client = new MongoClient(uri, options);
- globalWithMongo._mongoClientPromise = client.connect();
+ if (!globalWithMongo._mongoClient) {
+ globalWithMongo._mongoClient = new MongoClient(uri, options);
 }
- clientPromise = globalWithMongo._mongoClientPromise;
+ client = globalWithMongo._mongoClient;
 } else {
 // In production mode, it's best to not use a global variable.
 client = new MongoClient(uri, options);
- clientPromise = client.connect();
 }
 
-// Export a module-scoped MongoClient promise. By doing this in a
+// Export a module-scoped MongoClient. By doing this in a
 // separate module, the client can be shared across functions.
-export default clientPromise;
+export default client;
diff --git a/pages/api/movies.tsx b/pages/api/movies.tsx
index a6999fc..a879b7e 100644
--- a/pages/api/movies.tsx
+++ b/pages/api/movies.tsx
@@ -1,9 +1,8 @@
-import clientPromise from "../../lib/mongodb";
+import client from "../../lib/mongodb";
 import { NextApiRequest, NextApiResponse } from 'next';
 
 export default async (req: NextApiRequest, res: NextApiResponse) => {
 try {
- const client = await clientPromise;
 const db = client.db("sample_mflix");
 const movies = await db
 .collection("movies")
diff --git a/pages/index.tsx b/pages/index.tsx
index 145bf12..b52fcc5 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,5 +1,5 @@
 import Head from "next/head";
-import clientPromise from "../lib/mongodb";
+import client from "../lib/mongodb";
 import type { InferGetServerSidePropsType, GetServerSideProps } from "next";
 
 type ConnectionStatus = {
@@ -10,8 +10,8 @@ export const getServerSideProps: GetServerSideProps< ConnectionStatus> = async () => {
 try {
- await clientPromise;
- // `await clientPromise` will use the default database passed in the MONGODB_URI
+ await client.connect();
+ // `await client.connect()` will use the default database passed in the MONGODB_URI
 // However you can use another database (e.g. myDatabase) by replacing the `await clientPromise` with the following code:
 //
 // `const client = await clientPromise`
diff --git a/pages/movies.tsx b/pages/movies.tsx
index 516987b..c0f6cab 100644
--- a/pages/movies.tsx
+++ b/pages/movies.tsx
@@ -1,4 +1,4 @@
-import clientPromise from "../lib/mongodb";
+import client from "../lib/mongodb";
 import { GetServerSideProps } from 'next';
 
 interface Movie {
@@ -36,7 +36,6 @@ export default Movies;
 
 export const getServerSideProps: GetServerSideProps = async () => {
 try {
- const client = await clientPromise;
 const db = client.db("sample_mflix");
 const movies = await db
 .collection("movies")
diff --git a/pages/top.tsx b/pages/top.tsx
index 2f3837d..0329a11 100644
--- a/pages/top.tsx
+++ b/pages/top.tsx
@@ -1,5 +1,5 @@
 import { ObjectId } from "mongodb";
-import clientPromise from "../lib/mongodb";
+import client from "../lib/mongodb";
 import { GetStaticProps } from "next";
 
 interface Movie {
@@ -35,8 +35,6 @@ export default function Top({ movies }: TopProps) {
 
 export const getStaticProps: GetStaticProps<topprops> = async () => {
 try {
- const client = await clientPromise;
-
 const db = client.db("sample_mflix");
 
 const movies = await db
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/mongodb-developer/nextjs-with-mongodb/pull/1.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/mongodb-developer/nextjs-with-mongodb/pull/1.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>