diff --git a/src/components/Profile.js b/src/components/Profile.js
index 229a7d29..b70a2bd4 100644
--- a/src/components/Profile.js
+++ b/src/components/Profile.js
@@ -86,7 +86,7 @@ export class Profile extends React.Component {
 			<Container { ...containerProps }>
 				<UserBlock user={ user } />
 
-				{ user.facts && (
+				{ user.facts && user.facts.location && window.H2Data.site.mapbox_key && (
 					<Map
 						height="200"
 						location={ user.facts.location }
diff --git a/src/components/UserHovercard.js b/src/components/UserHovercard.js
index 4188a821..0e14524f 100644
--- a/src/components/UserHovercard.js
+++ b/src/components/UserHovercard.js
@@ -79,11 +79,13 @@ export function UserCard( { user } ) {
 					<p>{ user.facts.short_bio }</p>
 				</div>
 			</div>
-			<Map
-				height="150"
-				location={ user.facts.location }
-				width="150"
-			/>
+			{ user.facts.location && window.H2Data.site.mapbox_key && (
+				<Map
+					height="150"
+					location={ user.facts.location }
+					width="150"
+				/>
+			) }
 		</aside>
 	);
 }
@@ -92,7 +94,7 @@ export default class UserHovercard extends React.Component {
 	render() {
 		const { children, user } = this.props;
 
-		if ( ! user.facts || ! window.H2Data.site.mapbox_key ) {
+		if ( ! user.facts ) {
 			return children;
 		}
 
diff --git a/src/components/UserHovercard.stories.js b/src/components/UserHovercard.stories.js
index 212841bf..46700b11 100644
--- a/src/components/UserHovercard.stories.js
+++ b/src/components/UserHovercard.stories.js
@@ -31,3 +31,19 @@ export const Basic = () => (
 		/>
 	</Card>
 );
+
+export const WithoutLocation = () => (
+	<Card
+		{ ...commonProps }
+	>
+		<UserCard
+			user={ {
+				...user,
+				facts: {
+					...user.facts,
+					location: '',
+				},
+			} }
+		/>
+	</Card>
+);