diff --git a/src/firestore/index.ts b/src/firestore/index.ts
index 33f03d1d..eaeb5ea4 100644
--- a/src/firestore/index.ts
+++ b/src/firestore/index.ts
@@ -109,6 +109,10 @@ export function useDocument<T>(
  * @param name - name of the application
  * @returns the Firestore instance
  */
-export function useFirestore(name?: string) {
-  return getFirestore(useFirebaseApp(name))
+export function useFirestore(options?: string | { appName?: string; databaseId?: string }) {
+  if (typeof options === "object") {
+     return getFirestore(useFirebaseApp(options.appName), options.databaseId)
+  }
+
+  return getFirestore(useFirebaseApp(options))
 }