diff --git a/tide-whisperer.go b/tide-whisperer.go
index 67255dc6..9ba5e8fb 100644
--- a/tide-whisperer.go
+++ b/tide-whisperer.go
@@ -187,7 +187,11 @@ func main() {
 
 	storage := store.NewMongoStoreClient(&config.Mongo)
 	defer storage.Disconnect()
-	storage.EnsureIndexes()
+
+	disableIndexCreation, found := os.LookupEnv("TIDEPOOL_DISABLE_INDEX_CREATION")
+	if !found || disableIndexCreation != "true" {
+		storage.EnsureIndexes()
+	}
 
 	router := pat.New()