diff --git a/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java b/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
index 96882dcb..3fb0eb0a 100755
--- a/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
+++ b/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
@@ -382,6 +382,7 @@ public void onTick(long millisUntilFinished) {
                 public void onFinish() {
                     String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
                     String imageName = "IMG_" + timeStamp + ".jpg";
+                    Intent returnIntent = new Intent();
 
                     if (isSDCARDMounted()) {
                         String folderName = "PhotoEditorSDK";
@@ -391,6 +392,7 @@ public void onFinish() {
                         }
 
                         String selectedOutputPath = mediaStorageDir.getPath() + File.separator + imageName;
+                        returnIntent.putExtra("imagePath", selectedOutputPath);
                         Log.d("PhotoEditorSDK", "selected camera path " + selectedOutputPath);
                         File file = new File(selectedOutputPath);
 
@@ -408,7 +410,6 @@ public void onFinish() {
                         }
                     }
 
-                    Intent returnIntent = new Intent();
                     setResult(Activity.RESULT_OK, returnIntent);
                     finish();
                 }
@@ -453,9 +454,6 @@ public void onFinish() {
                     var7.printStackTrace();
                 }
 
-                Intent returnIntent = new Intent();
-                setResult(Activity.RESULT_OK, returnIntent);
-
                 Intent returnIntent = new Intent();
                 returnIntent.putExtra("imagePath", newPath);
                 setResult(Activity.RESULT_OK, returnIntent);