diff --git a/packages/common/.eslintrc.js b/packages/common/.eslintrc.js
index 91a3ae6e7b9..314d7ae6365 100644
--- a/packages/common/.eslintrc.js
+++ b/packages/common/.eslintrc.js
@@ -21,6 +21,27 @@ module.exports = {
           }
         ]
       }
+    ],
+    'no-restricted-syntax': [
+      'error',
+      {
+        selector:
+          'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] ReturnStatement > Identifier[name=undefined]',
+        message:
+          'Do not return undefined in React Query queryFn. Return null instead.'
+      },
+      {
+        selector:
+          'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] IfStatement > BlockStatement > ReturnStatement:not([argument])',
+        message:
+          'Do not return undefined in React Query queryFn. Return null instead.'
+      },
+      {
+        selector:
+          'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] ReturnStatement:not([argument])',
+        message:
+          'Do not return undefined in React Query queryFn. Return null instead.'
+      }
     ]
   }
 }
diff --git a/packages/common/src/api/tan-query/comments.ts b/packages/common/src/api/tan-query/comments.ts
index b78747621c7..c7119bc14a1 100644
--- a/packages/common/src/api/tan-query/comments.ts
+++ b/packages/common/src/api/tan-query/comments.ts
@@ -1102,7 +1102,7 @@ export const useGetTrackCommentNotificationSetting = (
   return useQuery({
     queryKey: getTrackCommentNotificationSettingQueryKey(trackId),
     queryFn: async () => {
-      if (!currentUserId) return
+      if (!currentUserId) return null
       const sdk = await audiusSdk()
       return await sdk.tracks.trackCommentNotificationSetting({
         trackId: Id.parse(trackId),