diff --git media.install media.install
index 68b2a91..3348835 100644
--- media.install
+++ media.install
@@ -136,6 +136,16 @@ function media_enable() {
     media_type_save($type);
     media_type_configure_formatters($type->name, $view_mode_settings[$type->name]);
   }
+  
+  // Define media type inside file_managed for files that have been uploaded
+  // before media module is enabled.
+  $fids = db_query('SELECT fid FROM {file_managed}');
+  foreach ($fids as $fid) {
+    $file = file_load($fid->fid);
+    $file->type = media_get_type($file);
+    drupal_write_record('file_managed', $file, array('fid'));
+    media_save_attached_file($file);
+  }
   
   // Set permissions
   $roles = user_roles();
@@ -488,3 +498,19 @@ function media_update_7013() {
     filter_format_save($format);
   }
 }
+
+/**
+ * Take into account files that have been uploaded before module install.  
+ */
+function media_update_7014() {
+  drupal_load('module', 'media');
+  
+  $files = file_load_multiple(FALSE);
+  
+  foreach ($files as $file => $fid) {
+    $file->type = media_get_type($file);
+    drupal_write_record('file_managed', $file, array('fid'));
+    media_save_attached_file($file);
+  }
+}