diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
index 4a359a03..a7f5551e 100644
--- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
+++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
@@ -130,7 +130,7 @@ final class DTOtoEntityConverter
 
         //If no name is given, try to extract the name from the URL
         if (empty($dto->name)) {
-            $entity->setName(basename($dto->url));
+            $entity->setName($this->getAttachmentNameFromURL($dto->url));
         } else {
             $entity->setName($dto->name);
         }
@@ -138,6 +138,11 @@ final class DTOtoEntityConverter
         return $entity;
     }
 
+    private function getAttachmentNameFromURL(string $url): string
+    {
+        return basename(parse_url($url, PHP_URL_PATH));
+    }
+
     /**
      * Converts a PartDetailDTO to a Part entity
      * @param  PartDetailDTO  $dto