diff --git a/pkg/jsonrpc/message.go b/pkg/jsonrpc/message.go
index 6fb1559d5bb23840c00e2fd00b3089ec3ffba20a..333b64acd7ebd3ed56937d34d708e64ef859037f 100644
--- a/pkg/jsonrpc/message.go
+++ b/pkg/jsonrpc/message.go
@@ -3,6 +3,7 @@ package jsonrpc
 import (
 	"encoding/json"
 	"io"
+	"log"
 
 	"golang.org/x/net/context"
 	"golang.org/x/sync/semaphore"
@@ -17,6 +18,7 @@ type flusher interface {
 
 func flushIfFlusher(w io.Writer) error {
 	if val, ok := w.(flusher); ok {
+		log.Println("flushing response from notification")
 		return val.Flush()
 	}
 	return nil
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 1d201bff5dbab5326219fd8911ed7c61bf35b66d..6bafda7b4a30373334e1df7b777077983d0b52a7 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -128,7 +128,7 @@ func serveSingle(ctx context.Context,
 		}
 	}
 	handler.ServeRPC(rw, req)
-	if rw.sendCalled == false && rw.id != nil {
+	if rw.sendCalled == false {
 		rw.Send(jsonrpc.Null, nil)
 	}
 	return nil