diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 58ca5dbf9..bee7dddfe 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.10
+Version: 1.36.11
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -430,6 +430,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Wed Nov 17 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.11-1
+- 1.36.11 release
+
 * Mon Oct 25 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.10-1
 - 1.36.10 release
 
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 7cb5724a1..126ed708e 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -378,9 +378,9 @@ bool MonitorStream::sendFrame(const char *filepath, const timeval &timestamp) {
 } // end bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp)
 
 bool MonitorStream::sendFrame(Image *image, const timeval &timestamp) {
-  Image *send_image = prepareImage(image);
   if (!config.timestamp_on_capture)
-    monitor->TimestampImage(send_image, timestamp);
+    monitor->TimestampImage(image, timestamp);
+  Image *send_image = prepareImage(image);
 
   fputs("--" BOUNDARY "\r\n", stdout);
 #if HAVE_LIBAVCODEC
@@ -864,14 +864,16 @@ void MonitorStream::SingleImage(int scale) {
   Debug(1, "write index: %d %d", monitor->shared_data->last_write_index, index);
   Image *snap_image = monitor->image_buffer[index];
 
+  if (!config.timestamp_on_capture) {
+    monitor->TimestampImage(snap_image, monitor->shared_timestamps[index]);
+  }
+
   if ( scale != ZM_SCALE_BASE ) {
     scaled_image.Assign(*snap_image);
     scaled_image.Scale(scale);
     snap_image = &scaled_image;
   }
-  if ( !config.timestamp_on_capture ) {
-    monitor->TimestampImage(snap_image, monitor->shared_timestamps[index]);
-  }
+
   snap_image->EncodeJpeg(img_buffer, &img_buffer_size);
 
   fprintf(stdout,
diff --git a/version b/version
index da140cd3f..9d48816e8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36.10
+1.36.11