diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a5775a25..5973ab077f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 * (x/foundation) [\#772](https://github.com/line/lbm-sdk/pull/772) export x/foundation pool
+* (baseapp) [\#781](https://github.com/line/lbm-sdk/pull/781) implement method `SetOption()` in baseapp
 
 ### Breaking Changes
 * (cli) [\#773](https://github.com/line/lbm-sdk/pull/773) guide users to use generate-only in messages for x/foundation authority
diff --git a/baseapp/abci.go b/baseapp/abci.go
index 7508a2e740..3a608e5da3 100644
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
@@ -118,8 +118,7 @@ func (app *BaseApp) Info(req abci.RequestInfo) abci.ResponseInfo {
 
 // SetOption implements the ABCI interface.
 func (app *BaseApp) SetOption(req abci.RequestSetOption) (res abci.ResponseSetOption) {
-	// TODO: Implement!
-	return
+	return abci.ResponseSetOption{}
 }
 
 // FilterPeerByAddrPort filters peers by address/port.