diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index d4f3d5c95094..8d5e5ac5293c 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -196,19 +196,22 @@ private void loadItems() {
     private void refresh() {
         backgroundJobManager.startImmediateFilesSyncJob(false, true);
 
-        // retry failed uploads
-        new Thread(() -> FileUploader.retryFailedUploads(
-            this,
-            uploadsStorageManager,
-            connectivityService,
-            userAccountManager,
-            powerManagementService))
-            .start();
+        if(uploadsStorageManager.getFailedUploads().length > 0){
+            // retry failed uploads
+            new Thread(() -> FileUploader.retryFailedUploads(
+                this,
+                uploadsStorageManager,
+                connectivityService,
+                userAccountManager,
+                powerManagementService))
+                .start();
+            DisplayUtils.showSnackMessage(this, R.string.uploader_local_files_uploaded);
+        }
+
 
         // update UI
         uploadListAdapter.loadUploadItemsFromDb();
         swipeListRefreshLayout.setRefreshing(false);
-        DisplayUtils.showSnackMessage(this, R.string.uploader_local_files_uploaded);
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce27d03b87a0..2eca42a81088 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -915,7 +915,7 @@
     <string name="failed_to_start_editor">Failed to start editor</string>
     <string name="create_rich_workspace">Add folder info</string>
     <string name="creates_rich_workspace">creates folder info</string>
-    <string name="uploader_local_files_uploaded">Try to upload local files again</string>
+    <string name="uploader_local_files_uploaded">Retry to upload failed local files</string>
     <string name="uploader_file_not_found_on_server_message">We couldnt locate the file on server. Another user may have deleted the file</string>
     <string name="uploader_file_not_found_message">File not found. Are you sure that this file exists or has a previous conflict not been resolved?</string>
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>