diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fdca99a..c3c372bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Changes from version 0.13.0 to master
 
+- Fixed dangling container used to check database version when running
+  _Starter_ on docker.
+
 ## Changes from version 0.12.0 to 0.13.0
 
 - Database upgrade procedure has changed.
diff --git a/service/version_check.go b/service/version_check.go
index 40f6cd01..362e7461 100644
--- a/service/version_check.go
+++ b/service/version_check.go
@@ -40,7 +40,7 @@ func (s *Service) DatabaseVersion(ctx context.Context) (driver.Version, error) {
 	if err != nil {
 		return "", maskAny(err)
 	}
-	//defer p.Cleanup()
+	defer p.Cleanup()
 	p.Wait()
 
 	// Parse output