diff --git a/rpc/lib/server/handlers.go b/rpc/lib/server/handlers.go
index 0bcf34bbd..6cc03012a 100644
--- a/rpc/lib/server/handlers.go
+++ b/rpc/lib/server/handlers.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 
-	"github.com/tendermint/go-amino"
+	amino "github.com/tendermint/go-amino"
 	types "github.com/tendermint/tendermint/rpc/lib/types"
 	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
diff --git a/rpc/lib/types/types.go b/rpc/lib/types/types.go
index 1eeb19ea8..fe9a92531 100644
--- a/rpc/lib/types/types.go
+++ b/rpc/lib/types/types.go
@@ -7,7 +7,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/tendermint/go-amino"
+
+	amino "github.com/tendermint/go-amino"
+
 	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 )
 
diff --git a/types/event_bus.go b/types/event_bus.go
index 7480c8240..cb4b17d51 100644
--- a/types/event_bus.go
+++ b/types/event_bus.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tendermint/tmlibs/log"
 )
 
-const defaultCapacity = 1000
+const defaultCapacity = 0
 
 type EventBusSubscriber interface {
 	Subscribe(ctx context.Context, subscriber string, query tmpubsub.Query, out chan<- interface{}) error