diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf838b2..81762cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [1.8.0] - 2021-06-01
+
+### Fixed
+- fixing sql error when EndDate is null (#58 and #69 by @alecdoconnor)
+
 ## [1.7.1] - 2021-06-01
 
 ### Changed
@@ -193,7 +198,8 @@
 
 ## [1.0.0] - 2021-02-15
 
-[Unreleased]: https://github.com/tobiasehlert/teslamateapi/compare/v1.7.1...HEAD
+[Unreleased]: https://github.com/tobiasehlert/teslamateapi/compare/v1.8.0...HEAD
+[1.8.0]: https://github.com/tobiasehlert/teslamateapi/compare/v1.7.1...v1.8.0
 [1.7.1]: https://github.com/tobiasehlert/teslamateapi/compare/v1.7.0...v1.7.1
 [1.7.0]: https://github.com/tobiasehlert/teslamateapi/compare/v1.6.2...v1.7.0
 [1.6.2]: https://github.com/tobiasehlert/teslamateapi/compare/v1.6.1...v1.6.2
diff --git a/src/webserver.go b/src/webserver.go
index ccb4e7b..a2f96a8 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -15,7 +15,7 @@ import (
 
 // setting TeslaMateApi version number
 // TODO: get the value from git-tag later..
-var apiVersion = "1.7.1"
+var apiVersion = "1.8.0"
 
 // defining db var
 var db *sql.DB