diff --git a/lib/deploy/firestore/prepare.js b/lib/deploy/firestore/prepare.js
index b1cacc552d9..ab399dd6d0d 100644
--- a/lib/deploy/firestore/prepare.js
+++ b/lib/deploy/firestore/prepare.js
@@ -21,7 +21,11 @@ function _prepareRules(context, options) {
 }
 
 function _prepareIndexes(context, options) {
-  return context.firestoreIndexes ? firestoreIndexes.prepare(context, options) : RSVP.resolve();
+  if (!(context.firestoreIndexes && options.config.get('firestore.indexes'))) {
+    return RSVP.resolve();
+  }
+
+  return firestoreIndexes.prepare(context, options);
 }
 
 module.exports = function(context, options) {