diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index d0a775f867..f24933446c 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -476,8 +476,10 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
                 mParents.add(dir);
         }
         //Make sure that path still exists, if it doesn't pop the stack and try the previous path
-        while(!mStorageManager.fileExists(generatePath(mParents))){
-            mParents.pop();
+        if (mParents.size() > 1) {
+            while(!mStorageManager.fileExists(generatePath(mParents))){
+                mParents.pop();
+            }
         }
     }