diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx
index 45a6fc8c..7f6f2fd3 100644
--- a/src/components/widgets/background/Background.jsx
+++ b/src/components/widgets/background/Background.jsx
@@ -224,11 +224,13 @@ export default class Background extends React.PureComponent {
         const photoPack = JSON.parse(localStorage.getItem('photo_packs'));
         if (photoPack) {
           const randomPhoto = photoPack[Math.floor(Math.random() * photoPack.length)];
+          const photoLocation = randomPhoto.location.replace(/[null]+/g, '');
           return this.setState({
             url: randomPhoto.url.default,
             photoInfo: {
               hidden: false,
-              credit: randomPhoto.photographer
+              credit: randomPhoto.photographer,
+              location: photoLocation !== ' ' && photoLocation !== '???' ? randomPhoto.location : 'N/A',
             }
           });
         }
diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx
index a7e76e52..b781aa3e 100644
--- a/src/components/widgets/background/PhotoInformation.jsx
+++ b/src/components/widgets/background/PhotoInformation.jsx
@@ -36,7 +36,7 @@ export default function PhotoInformation(props) {
   let photo = language.credit;
 
   // unsplash
-  if (props.info.photographerURL !== '' && !props.info.offline) {
+  if (props.info.photographerURL && props.info.photographerURL !== '' && !props.info.offline) {
     photo = <a href={props.info.photoURL} target='_blank' rel='noopener noreferrer'>{language.credit}</a>;
     credit = <><a href={props.info.photographerURL} target='_blank' rel='noopener noreferrer'>{photographer}</a> <a href='https://unsplash.com?utm_source=mue' target='_blank' rel='noopener noreferrer'>{language.unsplash}</a></>;
   }