diff --git a/server.go b/server.go
index 89d0d22e..b26c2ed0 100644
--- a/server.go
+++ b/server.go
@@ -362,7 +362,6 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 			ss.statusCode = convertCode(appErr)
 			ss.statusDesc = appErr.Error()
 		}
-		return nil
 	}
 	return t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
 
diff --git a/trace.go b/trace.go
index 24635740..316cc2c8 100644
--- a/trace.go
+++ b/trace.go
@@ -46,7 +46,7 @@ import (
 
 // EnableTracing controls whether to trace RPCs using the golang.org/x/net/trace package.
 // This should only be set before any RPCs are sent or received by this program.
-var EnableTracing = true
+var EnableTracing = false
 
 // methodFamily returns the trace family for the given method.
 // It turns "/pkg.Service/GetFoo" into "pkg.Service".