diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfd1ad13c..aec464e7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.18.1 / 2020-05-07
+
+* [BUGFIX] TSDB: Fixed snapshot API. #7217
+
 ## 2.18.0 / 2020-05-05
 
 * [CHANGE] Federation: Only use local TSDB for federation (ignore remote read). #7077
diff --git a/VERSION b/VERSION
index cf8690732..a36e9b090 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.18.0
+2.18.1
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index 2b7038138..a6b5c0ec0 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -389,6 +389,7 @@ func main() {
 	cfg.web.Context = ctxWeb
 	cfg.web.TSDBRetentionDuration = cfg.tsdb.RetentionDuration
 	cfg.web.TSDBMaxBytes = cfg.tsdb.MaxBytes
+	cfg.web.TSDBDir = cfg.localStoragePath
 	cfg.web.LocalStorage = localStorage
 	cfg.web.Storage = fanoutStorage
 	cfg.web.QueryEngine = queryEngine