diff --git a/firestore.html b/firestore.html
index 7d07384..b849e90 100644
--- a/firestore.html
+++ b/firestore.html
@@ -39,6 +39,12 @@
         <input type="text" id="node-input-projectId">
     </div>
 
+    <!--Database ID-->
+    <div class="form-row">
+        <label for="node-input-databaseId"><i class="fa fa-cloud"></i> Database</label>
+        <input type="text" id="node-input-databaseId">
+    </div>
+
     <!--Operation-->
     <div class="form-row">
         <label for="node-input-mode"><i class="fa fa-gear"></i> Operation</label>
@@ -94,7 +100,7 @@ <h3>Details</h3>
     </p>
 
     <p>
-    The configuration parameters of the node include the Project Id to be used for billing.
+    The configuration parameters of the node include the Project Id to be used for billing. If database is omitted, the default database will be used.
     </p>
 
     <p>
@@ -113,8 +119,9 @@ <h3>Details</h3>
     defaults: {
         account: { type: "google-cloud-credentials", required: false },
         keyFilename: { value: "", required: false },
-        name: { value: "", required: false },
         projectId: { value: "", required: true},
+        name: { value: "", required: false },
+        databaseId: { value: "", required: false},
         mode: { value: "set", required: false}
     },
     inputs: 1,
diff --git a/firestore.js b/firestore.js
index dc5b7ac..238fddb 100644
--- a/firestore.js
+++ b/firestore.js
@@ -41,6 +41,7 @@ module.exports = function(RED) {
         const node = this;
         const staticQuery = config.query;
         const projectId = config.projectId;
+        const databaseId = config.databaseId;
 
         let credentials = null;
         if (config.account) {
@@ -156,16 +157,19 @@ module.exports = function(RED) {
         if (credentials) {
             firestore = new Firestore({
                 "projectId": projectId,
+                "databaseId": databaseId,
                 "credentials": credentials
             });
         } else if (keyFilename) {
             firestore = new Firestore({
                 "projectId": projectId,
+                "databaseId": databaseId,
                 "keyFilename": keyFilename
             });
         } else {
             firestore = new Firestore({
-                "projectId": projectId
+                "projectId": projectId,
+                "databaseId": databaseId
             });
         }
 
@@ -174,4 +178,4 @@ module.exports = function(RED) {
 
 
     RED.nodes.registerType(NODE_TYPE, FireStoreNode);
-};
\ No newline at end of file
+};