diff --git a/src/ds/d400/d400-device.cpp b/src/ds/d400/d400-device.cpp
index 68e0d259c5f..72bfdbac37f 100644
--- a/src/ds/d400/d400-device.cpp
+++ b/src/ds/d400/d400-device.cpp
@@ -1104,9 +1104,14 @@ namespace librealsense
         else  // keep backward compatible with previous behavior
         {  
             depth_sensor.register_metadata(RS2_FRAME_METADATA_SENSOR_TIMESTAMP,
-                                       make_attribute_parser(&md_mipi_depth_mode::hw_timestamp,
-                                                             md_mipi_depth_control_attributes::hw_timestamp_attribute,
-                                                             md_prop_offset));
+                                           make_attribute_parser(&md_mipi_depth_mode::hw_timestamp,
+                                                                 md_mipi_depth_control_attributes::hw_timestamp_attribute,
+                                                                 md_prop_offset));
+
+            /*depth_sensor.register_metadata(RS2_FRAME_METADATA_SENSOR_TIMESTAMP,
+                                           make_attribute_parser(&md_mipi_depth_mode::optical_timestamp,
+                                                                 md_mipi_depth_control_attributes::optical_timestamp_attribute,
+                                                                 md_prop_offset));*/
         }
 
         depth_sensor.register_metadata(RS2_FRAME_METADATA_ACTUAL_EXPOSURE,