diff --git a/file_entity.module b/file_entity.module
index da2914f..ad08d68 100644
--- a/file_entity.module
+++ b/file_entity.module
@@ -2551,7 +2551,11 @@ function file_entity_field_attach_load($entity_type, $entities, $age, $options)
               }
             }
           }
+          // Filter out missing files
+          $entity->{$field_name}[$langcode] = $items = array_filter($items);
         }
+        // Filter out empty language sets
+        $entity->{$field_name} = array_filter($entity->{$field_name});
       }
     }
   }