diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index 7d5974e0..02f628d4 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -1,5 +1,6 @@
 package com.xypower.mpapp;
 
+import static java.lang.System.err;
 import static java.lang.System.loadLibrary;
 
 import android.app.AlarmManager;
@@ -433,6 +434,11 @@ public class MicroPhotoService extends Service {
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
+        try {
+            alarmManager.cancel(pendingIntent);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
 
         long currentTimeMillis = System.currentTimeMillis();
         Date date = new Date(currentTimeMillis + timeout);
@@ -485,7 +491,7 @@ public class MicroPhotoService extends Service {
                 val = photoTimeData[idx];
                 ts = (int) ((val & 0x00FFFFFF00000000L) >> 32) + offset;
 
-                if (ts < secondsOfToday) {
+                if (ts <= secondsOfToday) {
                     continue;
                 }