diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
index 18fab4f99c..cc28d40df4 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
@@ -135,11 +135,19 @@
 
 - (NSString *)fileName
 {
-    if (self.backingAsset != nil)
-        return [self.backingAsset valueForKey:@"filename"];
-    else if (self.backingLegacyAsset != nil)
+    if (self.backingAsset != nil) {
+        NSString *fileName = [self.backingAsset valueForKey:@"filename"];
+        if (fileName == nil) {
+            NSArray *resources = [PHAssetResource assetResourcesForAsset:self.backingAsset];
+            PHAssetResource *resource = resources.firstObject;
+            if (resource != nil) {
+                fileName = resource.originalFilename;
+            }
+        }
+        return fileName;
+    } else if (self.backingLegacyAsset != nil) {
         return self.backingLegacyAsset.defaultRepresentation.filename;
-    
+    }
     return nil;
 }
 
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
index 1f0d178672..3b0cefb595 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
@@ -295,6 +295,9 @@
                     if (!found)
                         fileName = asset.fileName;
                 }
+                if (fileName == nil) {
+                    fileName = asset.fileName;
+                }
                 
                 if (iosMajorVersion() >= 10 && [dataUTI rangeOfString:@"heic"].location != NSNotFound)
                 {