diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c18c173c90d76444c29ffccd199aa98f57bc6b7d..5efc1c09bb94d6d09ce5ca14d056b00f0a813d3e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -37,6 +37,7 @@ Views 2.x-dev
     o #485872 by dereine: Make sure views.css is always loaded for all users.
     o #442982 by killes: Make destroy() method more robust so that views are more readily reused.
     o #520558 by bdurbin: node access filter not properly checking 'view'.
+    o #535424 by Hugo Wetterberg: Download file link could provide empty a tag if no file is available.
 
   Other changes:
     o Implement a post_render hook (for themes too) and cache method.
diff --git a/modules/upload/views_handler_field_upload_description.inc b/modules/upload/views_handler_field_upload_description.inc
index def55d14b9e2d03dbe0f134738fdd431d3813f9f..623e44992d4b03bf76b8c5722ed4be1e3c3e34ad 100644
--- a/modules/upload/views_handler_field_upload_description.inc
+++ b/modules/upload/views_handler_field_upload_description.inc
@@ -65,6 +65,9 @@ class views_handler_field_upload_description extends views_handler_field {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = file_create_url($values->filepath);
     }
+    else {
+      $this->options['alter']['make_link'] = FALSE;
+    }
     return $data;
   }
 }