diff --git a/spinnaker_camera_driver/src/SpinnakerCamera.cpp b/spinnaker_camera_driver/src/SpinnakerCamera.cpp
index ca6bf400..7da7d235 100644
--- a/spinnaker_camera_driver/src/SpinnakerCamera.cpp
+++ b/spinnaker_camera_driver/src/SpinnakerCamera.cpp
@@ -417,9 +417,16 @@ void SpinnakerCamera::grabImage(sensor_msgs::Image* image, const std::string& fr
       if (use_device_seq_) image->header.seq = static_cast<uint32_t>(image_ptr->GetID());
       else                 image->header.seq = seq_++;
 
-      ros::Time img_time = ros::Time();
-      img_time.fromNSec(static_cast<uint64_t>(image_ptr->GetTimeStamp()));
-      image->header.stamp = img_time + timestamp_diff;
+      if (use_device_timestamp)
+      {
+        ros::Time img_time = ros::Time();
+        img_time.fromNSec(static_cast<uint64_t>(image_ptr->GetTimeStamp()));
+        image->header.stamp = img_time + timestamp_diff;
+      }
+      else
+      {
+        image->header.stamp = ros::Time::now();
+      }
 
       if (image_ptr->IsCompressed())
       {