diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 2ee786ae..8febf6e3 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -786,12 +786,12 @@ bool CPhoneDevice::Reboot(int resetType)
               GpioControl::reboot();
           });
         t.detach();
-
-        return true;
     }
-
-    long timeout = 1000;
-    RestartApp(resetType, timeout);
+    else
+    {
+        long timeout = 1000;
+        RestartApp(resetType, timeout);
+    }
 
     return true;
 }
@@ -1178,6 +1178,10 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
     params.zoom = mPhotoInfo.zoom;
     params.zoomRatio = mPhotoInfo.zoomRatio;
     params.requestTemplate = mPhotoInfo.requestTemplate;
+    if (params.requestTemplate <= 0 || params.requestTemplate > 5)
+    {
+        params.requestTemplate = 2;
+    }
 
     if (photoInfo.ldrEnabled)
     {