diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 77fe72b2c..032cd2e91 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -281,7 +281,7 @@ void Event::StreamEvent( const char *path, int event_id, long refresh, FILE *fd
 		exit( mysql_errno( &dbconn ) );
 	}
 
-	setbuf( fd, 0 );
+	//setbuf( fd, 0 );
 	fprintf( fd, "Server: ZoneMinder Stream Server\r\n" );
 	fprintf( fd, "Pragma: no-cache\r\n" );
 	fprintf( fd, "Cache-Control: no-cache\r\n" );
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 8f4308e79..078f9de64 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -675,7 +675,7 @@ void Monitor::StreamImages( unsigned long idle, unsigned long refresh, FILE *fd,
 {
 	time_t start_time, now;
 
-	setbuf( fd, 0 );
+	//setbuf( fd, 0 );
 	fprintf( fd, "Server: ZoneMinder Stream Server\r\n" );
 	fprintf( fd, "Pragma: no-cache\r\n" );
 	fprintf( fd, "Cache-Control: no-cache\r\n" );