diff --git a/.changelog/3097.txt b/.changelog/3097.txt
new file mode 100644
index 0000000000..062c56f5e6
--- /dev/null
+++ b/.changelog/3097.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+firestore: fixed import of `google_firestore_index` when database or collection were non-default.
+```
diff --git a/google-beta/resource_firestore_index.go b/google-beta/resource_firestore_index.go
index 377a27e274..8d9bf27803 100644
--- a/google-beta/resource_firestore_index.go
+++ b/google-beta/resource_firestore_index.go
@@ -282,6 +282,8 @@ func resourceFirestoreIndexImport(d *schema.ResourceData, meta interface{}) ([]*
 	}
 
 	d.Set("project", stringParts[1])
+	d.Set("database", stringParts[3])
+	d.Set("collection", stringParts[5])
 	return []*schema.ResourceData{d}, nil
 }