diff --git a/source/src/SGCP.c b/source/src/SGCP.c
index 733a12d..9ef9106 100644
--- a/source/src/SGCP.c
+++ b/source/src/SGCP.c
@@ -1864,6 +1864,7 @@ void GwRevLoopHandler(void)
 			if(SGCP.LaserOnOff == true)
 			{
 				LASER1_ON();
+				SGCP.LaserTimerCount = SGCP.LaserTimerMinutes * 2;
 				if(SGCP.LoginOk == true)
 					ToGWLaserRes(SGCP.LaserOnOff);
 				DBG_LOG("The laser has been activated!\r\n");
@@ -1877,7 +1878,6 @@ void GwRevLoopHandler(void)
 			}
 			SGCP.GWStatus = GW_STATUS_IDLE;
 		break;}
-
 		case GW_STATUS_SIGNAL:{
 			DBG_LOG("Query signal quality...\r\n");
 			SGCP.Gateway_IRQ_Status = false;
diff --git a/source/src/main.c b/source/src/main.c
index 2aad783..7ae88fe 100644
--- a/source/src/main.c
+++ b/source/src/main.c
@@ -1,4 +1,4 @@
-
+
 /******************************************************************************
  * Include files
  ******************************************************************************/
@@ -372,7 +372,7 @@ static void AppLoopHandler(void)
 				SGCP.GWStatus = GW_STATUS_UPLOAD_SENSOR;//上传
 				App.Status = APP_STATUS_WAIT_UPLOAD;
 			}
-			else if(SGCP.LaserOnOff == true && SGCP.LaserTimerCount == 0 && SGCP.GWStatus == GW_STATUS_IDLE)
+			else if(SGCP.LaserOnOff == true && SGCP.LaserTimerMinutes > 0 && SGCP.LaserTimerCount == 0 && SGCP.GWStatus == GW_STATUS_IDLE)
 			{
 				SGCP.LaserOnOff = false;
 				SGCP.GWStatus = GW_STATUS_LASER_STARES;