diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go
index 5dd049f49c564..1c9109d910f6b 100644
--- a/pkg/apis/application/v1alpha1/types.go
+++ b/pkg/apis/application/v1alpha1/types.go
@@ -22,14 +22,14 @@ type Application struct {
 
 // ApplicationWatchEvent contains information about application change.
 type ApplicationWatchEvent struct {
-	Type watch.EventType `protobuf:"bytes,1,opt,name=type,casttype=k8s.io/apimachinery/pkg/watch.EventType"`
+	Type watch.EventType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=k8s.io/apimachinery/pkg/watch.EventType"`
 
 	// Application is:
 	//  * If Type is Added or Modified: the new state of the object.
 	//  * If Type is Deleted: the state of the object immediately before deletion.
 	//  * If Type is Error: *api.Status is recommended; other types may make sense
 	//    depending on context.
-	Application Application `protobuf:"bytes,2,opt,name=application"`
+	Application Application `json:"application" protobuf:"bytes,2,opt,name=application"`
 }
 
 // ApplicationList is list of Application resources
diff --git a/server/application/forwarder_overwrite.go b/server/application/forwarder_overwrite.go
index 1290f72860586..32e5b0c0ba314 100644
--- a/server/application/forwarder_overwrite.go
+++ b/server/application/forwarder_overwrite.go
@@ -1,21 +1,58 @@
 package application
 
 import (
+	"io"
 	"net/http"
 
+	"encoding/json"
+
+	"fmt"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"golang.org/x/net/context"
 )
 
+type SSEMarshaler struct {
+}
+
+func (m *SSEMarshaler) Marshal(v interface{}) ([]byte, error) {
+	str, err := json.Marshal(v)
+	if err != nil {
+		return nil, err
+	}
+	return []byte(fmt.Sprintf("data: %s \n\n", str)), nil
+}
+
+func (m *SSEMarshaler) Unmarshal(data []byte, v interface{}) error {
+	return nil
+}
+
+func (m *SSEMarshaler) NewDecoder(r io.Reader) runtime.Decoder {
+	return nil
+}
+
+func (m *SSEMarshaler) NewEncoder(w io.Writer) runtime.Encoder {
+	return nil
+}
+
+func (m *SSEMarshaler) ContentType() string {
+	return "text/event-stream"
+}
+
+var (
+	sseMarshaler SSEMarshaler
+)
+
 func init() {
 	forward_ApplicationService_Watch_0 = func(ctx context.Context, mux *runtime.ServeMux, marshaler runtime.Marshaler, w http.ResponseWriter, req *http.Request, recv func() (proto.Message, error), opts ...func(context.Context, http.ResponseWriter, proto.Message) error) {
-		opts = append(opts, func(i context.Context, writer http.ResponseWriter, message proto.Message) error {
+		if req.Header.Get("Accept") == "text/event-stream" {
 			w.Header().Set("Content-Type", "text/event-stream")
 			w.Header().Set("Transfer-Encoding", "chunked")
 			w.Header().Set("X-Content-Type-Options", "nosniff")
-			return nil
-		})
-		runtime.ForwardResponseStream(ctx, mux, marshaler, w, req, recv, opts...)
+			runtime.ForwardResponseStream(ctx, mux, &sseMarshaler, w, req, recv, opts...)
+		} else {
+			runtime.ForwardResponseStream(ctx, mux, marshaler, w, req, recv, opts...)
+		}
 	}
 }