diff --git a/services/uploads/src/clamav.js b/services/uploads/src/clamav.js
index cfcb1a0d8..838ccf6d0 100644
--- a/services/uploads/src/clamav.js
+++ b/services/uploads/src/clamav.js
@@ -27,7 +27,7 @@ async function listBucketFiles(bucketName) {
   });
   try {
     const listFilesResult = await S3.send(listObjects);
-    const keys = listFilesResult.Contents.map((c) => c.Key);
+    const keys = listFilesResult?.Contents?.map((c) => c.Key);
     return keys;
   } catch (err) {
     utils.generateSystemMessage(`Error listing files`);
@@ -126,12 +126,11 @@ async function uploadAVDefinitions() {
   utils.generateSystemMessage("Uploading Definitions");
   const s3AllFullKeys = await listBucketFiles(constants.CLAMAV_BUCKET_NAME);
 
-  const s3DefinitionFileFullKeys = s3AllFullKeys.filter((key) =>
-    key.startsWith(constants.PATH_TO_AV_DEFINITIONS)
-  );
-
   // If there are any s3 Definition files in the s3 bucket, delete them.
-  if (s3DefinitionFileFullKeys.length != 0) {
+  if (s3AllFullKeys?.length != 0) {
+    const s3DefinitionFileFullKeys = s3AllFullKeys.filter((key) =>
+      key.startsWith(constants.PATH_TO_AV_DEFINITIONS)
+    );
     const deleteObject = new DeleteObjectsCommand({
       Bucket: constants.CLAMAV_BUCKET_NAME,
       Delete: {