diff --git a/server/server.go b/server/server.go
index 541f76c01..c31aa3c0f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -160,6 +160,7 @@ func (s *Server) handleFunc(path string, f func(http.ResponseWriter, *http.Reque
 		if err := f(w, req); err != nil {
 			if etcdErr, ok := err.(*etcdErr.Error); ok {
 				log.Debug("Return error: ", (*etcdErr).Error())
+				w.Header().Set("Content-Type", "application/json")
 				etcdErr.Write(w)
 			} else {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -260,6 +261,7 @@ func (s *Server) Dispatch(c raft.Command, w http.ResponseWriter, req *http.Reque
 			e, _ := result.(*store.Event)
 			b, _ = json.Marshal(e)
 
+			w.Header().Set("Content-Type", "application/json")
 			// etcd index should be the same as the event index
 			// which is also the last modified index of the node
 			w.Header().Add("X-Etcd-Index", fmt.Sprint(e.Index))
diff --git a/server/v2/get_handler.go b/server/v2/get_handler.go
index 3e8ddee64..2e9873571 100644
--- a/server/v2/get_handler.go
+++ b/server/v2/get_handler.go
@@ -68,6 +68,7 @@ func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 		}
 	}
 
+	w.Header().Set("Content-Type", "application/json")
 	w.Header().Add("X-Etcd-Index", fmt.Sprint(s.Store().Index()))
 	w.Header().Add("X-Raft-Index", fmt.Sprint(s.CommitIndex()))
 	w.Header().Add("X-Raft-Term", fmt.Sprint(s.Term()))