diff --git a/server/websocket.go b/server/websocket.go
index e60af0aa..0c9ec060 100644
--- a/server/websocket.go
+++ b/server/websocket.go
@@ -387,6 +387,9 @@ func (s *WebsocketServer) getAccountInfo(req *accountInfoReq) (res *api.Address,
 		Vout:           api.AddressFilterVoutOff,
 		TokensToReturn: tokensToReturn,
 	}
+	if req.PageSize == 0 {
+		req.PageSize = txsOnPage
+	}
 	a, err := s.api.GetXpubAddress(req.Descriptor, req.Page, req.PageSize, opt, &filter, 0)
 	if err != nil {
 		return s.api.GetAddress(req.Descriptor, req.Page, req.PageSize, opt, &filter)