diff --git a/src/app/Components/Artist/ArtistHeaderNavRight.tsx b/src/app/Components/Artist/ArtistHeaderNavRight.tsx
index 2863996f36e..24aff533ca9 100644
--- a/src/app/Components/Artist/ArtistHeaderNavRight.tsx
+++ b/src/app/Components/Artist/ArtistHeaderNavRight.tsx
@@ -45,7 +45,7 @@ export const ArtistHeaderNavRight: React.FC<ArtistHeaderNavRightProps> = ({
         <FollowButton
           haptic
           isFollowed={isFollowed}
-          followCount={data!.counts.follows}
+          followCount={data?.counts.follows}
           onPress={() => setIsFollowed(!isFollowed)}
           ml={1}
         />
diff --git a/src/app/Scenes/Artist/Artist.tsx b/src/app/Scenes/Artist/Artist.tsx
index 57391f2c0f8..6207acd97f4 100644
--- a/src/app/Scenes/Artist/Artist.tsx
+++ b/src/app/Scenes/Artist/Artist.tsx
@@ -187,7 +187,7 @@ interface ArtistQueryRendererProps {
 
 export const ArtistScreenQuery = graphql`
   query ArtistAboveTheFoldQuery($artistID: String!, $input: FilterArtworksInput) {
-    artist(id: $artistID) {
+    artist(id: $artistID) @principalField {
       ...ArtistHeader_artist
       ...ArtistArtworks_artist @arguments(input: $input)
       ...ArtistHeaderNavRight_artist
diff --git a/src/app/system/relay/middlewares/errorMiddleware.ts b/src/app/system/relay/middlewares/errorMiddleware.ts
index 7eb1eabff9b..2c90056ca03 100644
--- a/src/app/system/relay/middlewares/errorMiddleware.ts
+++ b/src/app/system/relay/middlewares/errorMiddleware.ts
@@ -11,6 +11,8 @@ const newErrorMiddlewareOptedInQueries = [
   "ArtworkAboveTheFoldQuery",
   "ArtworkBelowTheFoldQuery",
   "SearchQuery",
+  "ArtistAboveTheFoldQuery",
+  "ArtistBelowTheFoldQuery",
   "InboxQuery",
 ]