diff --git a/PENDING.md b/PENDING.md
index 2e93ddea5c..1c782aa4fb 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -48,7 +48,8 @@ BUG FIXES
 * Gaia CLI  (`gaiacli`)
 
 * Gaia
-
+  * [\#2742](https://github.com/cosmos/cosmos-sdk/issues/2742) Fix time format of TimeoutCommit override 
+  
 * SDK
 
 * Tendermint
diff --git a/server/util.go b/server/util.go
index 51f10c765a..633ad88704 100644
--- a/server/util.go
+++ b/server/util.go
@@ -7,6 +7,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"syscall"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -92,7 +93,7 @@ func interceptLoadConfig() (conf *cfg.Config, err error) {
 		conf.P2P.RecvRate = 5120000
 		conf.P2P.SendRate = 5120000
 		conf.TxIndex.IndexAllTags = true
-		conf.Consensus.TimeoutCommit = 5000
+		conf.Consensus.TimeoutCommit = 5 * time.Second
 		cfg.WriteConfigFile(configFilePath, conf)
 		// Fall through, just so that its parsed into memory.
 	}