diff --git a/pkg/httplog/log.go b/pkg/httplog/log.go
index fc594fd1d0a..757a15b5e5c 100644
--- a/pkg/httplog/log.go
+++ b/pkg/httplog/log.go
@@ -161,6 +161,16 @@ func (rl *respLogger) Write(b []byte) (int, error) {
 	return rl.w.Write(b)
 }
 
+// Flush implements http.Flusher even if the underlying http.Writer doesn't implement it.
+// Flush is used for streaming purposes and allows to flush buffered data to the client.
+func (rl *respLogger) Flush() {
+	if flusher, ok := rl.w.(http.Flusher); ok {
+		flusher.Flush()
+	} else {
+		glog.V(2).Infof("Unable to convert %v into http.Flusher", rl.w)
+	}
+}
+
 // WriteHeader implements http.ResponseWriter.
 func (rl *respLogger) WriteHeader(status int) {
 	rl.status = status
diff --git a/pkg/kubelet/server.go b/pkg/kubelet/server.go
index 3840598fe4c..0971317d6cc 100644
--- a/pkg/kubelet/server.go
+++ b/pkg/kubelet/server.go
@@ -212,8 +212,10 @@ func (s *Server) handleContainerLogs(w http.ResponseWriter, req *http.Request) {
 	})
 
 	fw := FlushWriter{writer: w}
-	if flusher, ok := w.(http.Flusher); ok {
+	if flusher, ok := fw.writer.(http.Flusher); ok {
 		fw.flusher = flusher
+	} else {
+		s.error(w, fmt.Errorf("Unable to convert %v into http.Flusher", fw))
 	}
 	w.Header().Set("Transfer-Encoding", "chunked")
 	w.WriteHeader(http.StatusOK)