diff --git a/client/src/composition/Feed/index.tsx b/client/src/composition/Feed/index.tsx
index a473eeed..475e0fac 100644
--- a/client/src/composition/Feed/index.tsx
+++ b/client/src/composition/Feed/index.tsx
@@ -25,7 +25,7 @@ const FeedList = () => {
   const { data: myInfo } = useMeQuery();
   const { data, fetchMore, subscribeToMore } = useGetfeedsQuery({
     variables: { first: OFFSET, currentCursor: '9999-12-31T09:29:26.050Z' },
-    notifyOnNetworkStatusChange: true
+    fetchPolicy: 'network-only'
   });
 
   const scrollTop = () => {
diff --git a/server/src/api/feed/feed.resolvers.ts b/server/src/api/feed/feed.resolvers.ts
index 8246d6d2..792b95c3 100644
--- a/server/src/api/feed/feed.resolvers.ts
+++ b/server/src/api/feed/feed.resolvers.ts
@@ -87,7 +87,6 @@ const checkIsFriend = async (friendEmail, myEmail) => {
   });
   const [parsedResult] = ParseResultRecords(result.records);
 
-  console.log('parsedResult ', parsedResult);
   if (parsedResult.isFriend > 0) {
     return true;
   }
@@ -174,23 +173,18 @@ export default {
     feeds: {
       subscribe: withFilter(
         (_, __, { pubsub }) => {
-          console.log('subscribed');
           return pubsub.asyncIterator(NEW_FEED);
         },
-        async (_, variables, context) => {
+        async (payload, _, context) => {
           const myEmail = context.email;
-          const friendEmail = variables.userEmail;
+          const friendEmail = payload.feeds.feedItems[0].searchUser.email;
           const isFriend = await checkIsFriend(friendEmail, myEmail);
-          /* if (isFriend && myEmail === friendEmail) {
+
+          if (isFriend || myEmail === friendEmail) {
             return true;
           } else {
             return false;
-          } */
-
-          console.log(isFriend);
-          console.log('myEmail ', myEmail);
-          console.log('friendEmail ', friendEmail);
-          return true;
+          }
         }
       )
     }