diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go
index 578e1b051..c0ebb771b 100644
--- a/abci/client/socket_client.go
+++ b/abci/client/socket_client.go
@@ -377,19 +377,21 @@ func (cli *socketClient) ProcessProposal(ctx context.Context, req *types.Request
 }
 
 func (cli *socketClient) ExtendVote(ctx context.Context, req *types.RequestExtendVote) (*types.ResponseExtendVote, error) {
-	res, err := cli.doRequest(ctx, types.ToRequestExtendVote(req))
+	reqRes, err := cli.queueRequest(ctx, types.ToRequestExtendVote(req))
 	if err != nil {
 		return nil, err
 	}
-	return res.GetExtendVote(), nil
+	reqRes.Wait()
+	return reqRes.Response.GetExtendVote(), nil
 }
 
 func (cli *socketClient) VerifyVoteExtension(ctx context.Context, req *types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) {
-	res, err := cli.doRequest(ctx, types.ToRequestVerifyVoteExtension(req))
+	reqRes, err := cli.queueRequest(ctx, types.ToRequestVerifyVoteExtension(req))
 	if err != nil {
 		return nil, err
 	}
-	return res.GetVerifyVoteExtension(), nil
+	reqRes.Wait()
+	return reqRes.Response.GetVerifyVoteExtension(), nil
 }
 
 func (cli *socketClient) FinalizeBlock(ctx context.Context, req *types.RequestFinalizeBlock) (*types.ResponseFinalizeBlock, error) {
diff --git a/test/e2e/app/sync_app.go b/test/e2e/app/sync_app.go
index 0b6d413c1..7b1a0c044 100644
--- a/test/e2e/app/sync_app.go
+++ b/test/e2e/app/sync_app.go
@@ -59,6 +59,18 @@ func (app *SyncApplication) ProcessProposal(ctx context.Context, req *abci.Reque
 	return app.app.ProcessProposal(ctx, req)
 }
 
+func (app *SyncApplication) ExtendVote(ctx context.Context, req *abci.RequestExtendVote) (*abci.ResponseExtendVote, error) {
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
+	return app.app.ExtendVote(ctx, req)
+}
+
+func (app *SyncApplication) VerifyVoteExtension(ctx context.Context, req *abci.RequestVerifyVoteExtension) (*abci.ResponseVerifyVoteExtension, error) {
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
+	return app.app.VerifyVoteExtension(ctx, req)
+}
+
 func (app *SyncApplication) FinalizeBlock(ctx context.Context, req *abci.RequestFinalizeBlock) (*abci.ResponseFinalizeBlock, error) {
 	app.mtx.Lock()
 	defer app.mtx.Unlock()