diff --git a/src/zm_fifo.cpp b/src/zm_fifo.cpp
index 8743fa844..d3952a169 100644
--- a/src/zm_fifo.cpp
+++ b/src/zm_fifo.cpp
@@ -57,8 +57,8 @@ static bool zmFifoDbgOpen() {
 
 int zmFifoDbgInit(Monitor *monitor) {
   zm_fifodbg_inited = true;
-  snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/%d/dbgpipe.log",
-      monitor->getStorage()->Path(), monitor->Id());
+  snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/dbgpipe-%d.log",
+      staticConfig.PATH_SOCKS.c_str(), monitor->Id());
   zmFifoDbgOpen();
   return 1;
 }
@@ -211,17 +211,18 @@ void FifoStream::setStreamStart(int monitor_id, const char * format) {
 
   if ( !strcmp(format, "reference") ) {
     stream_type = MJPEG;
-    filename = "diagpipe-r.jpg";
+    snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-r-%d.jpg",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
   } else if ( !strcmp(format, "delta") ) {
-    filename = "diagpipe-d.jpg";
+    snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-d-%d.jpg",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
     stream_type = MJPEG;
   } else {
+    snprintf(diag_path, sizeof(diag_path), "%s/dbgpipe-%d.log",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
     stream_type = RAW;
-    filename = "dbgpipe.log";
   }
 
-  snprintf(diag_path, sizeof(diag_path), "%s/%d/%s",
-      staticConfig.PATH_SOCKS.c_str(), monitor->Id(), filename);
   setStreamStart(diag_path);
 }
 
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 8fed25acc..01779eed7 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -516,8 +516,8 @@ Monitor::Monitor(
 
     if ( config.record_diag_images ) {
       if ( config.record_diag_images_fifo ) {
-        diag_path_ref = stringtf("%s/%d/diagpipe-r.jpg", staticConfig.PATH_SOCKS.c_str(), id);
-        diag_path_delta = stringtf("%s/%d/diagpipe-d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
+        diag_path_ref = stringtf("%s/diagpipe-r-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
+        diag_path_delta = stringtf("%s/diagpipe-d-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
         FifoStream::fifo_create_if_missing(diag_path_ref.c_str());
         FifoStream::fifo_create_if_missing(diag_path_delta.c_str());
       } else {