diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index d8d4b5b7..d12723b8 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -456,8 +456,7 @@ public class MicroPhotoService extends Service {
                 }
 
                 // Register Next Photo Timer
-                Date date = new Date();
-                long startTime = (date.getTime() + 999) / 1000 + 1;    // Add one second
+                long startTime = (ts == 0) ? (((new Date()).getTime() + 999) / 1000 + 1) : (ts + 1);    // Add one second
                 mService.updateCaptureSchedule(startTime);
             } else if (TextUtils.equals(ACTION_HEARTBEAT_MANUALLY, action)) {
                 Log.i(TAG, "HB Timer Fired ACTION=" + action);