diff --git modules/system/system.install modules/system/system.install
index 9c99ba9..8d0229d 100644
--- modules/system/system.install
+++ modules/system/system.install
@@ -2593,6 +2593,17 @@ function system_update_7060() {
     return;
   }
 
+  // Check if there is data to migrate.
+  if (!db_query_range('SELECT 1 FROM {upload}', 0, 1)->fetchField()) {
+    // Table is empty, remove variables and then remove the table, no
+    // fields should be created in this case.
+    foreach (_update_7000_node_get_types() as $node_type) {
+      variable_del('upload_' . $node_type->type);
+    }
+    db_drop_table('upload');
+    return;
+  }
+
   // Check which node types have upload.module attachments enabled.
   $context['types'] = array();
   foreach (_update_7000_node_get_types() as $node_type) {