diff --git a/locking/boltdb/boltdb.go b/locking/boltdb/boltdb.go
index 3ef65ce7ce..4ffd485d88 100644
--- a/locking/boltdb/boltdb.go
+++ b/locking/boltdb/boltdb.go
@@ -196,6 +196,8 @@ func (b BoltLocker) GetLock(p models.Project, env string) (*models.ProjectLock,
 		return nil, errors.Wrapf(err, "deserializing lock at key %q", key)
 	}
 
+	// need to set it to Local after deserialization due to https://github.com/golang/go/issues/19486
+	lock.Time = lock.Time.Local()
 	return &lock, nil
 }
 
diff --git a/locking/boltdb/boltdb_test.go b/locking/boltdb/boltdb_test.go
index b1e32718c3..5bdad07d4e 100644
--- a/locking/boltdb/boltdb_test.go
+++ b/locking/boltdb/boltdb_test.go
@@ -329,7 +329,6 @@ func TestGetLock(t *testing.T) {
 
 	l, err := b.GetLock(project, env)
 	Ok(t, err)
-	l.Time = l.Time.Local()
 	Equals(t, &lock, l)
 }