diff --git a/services/filestore/app/coffee/BucketController.coffee b/services/filestore/app/coffee/BucketController.coffee
index ed7781fdda..81c660ec69 100644
--- a/services/filestore/app/coffee/BucketController.coffee
+++ b/services/filestore/app/coffee/BucketController.coffee
@@ -9,7 +9,7 @@ module.exports = BucketController =
 	getFile: (req, res)->
 		{bucket} = req.params
 		key = req.params[0]
-		credentials = settings.filestore.s3[bucket]
+		credentials = settings.filestore.s3?[bucket]
 		options = {
 			key: key,
 			bucket: bucket,