diff --git a/packages/frontend/src/views/Timeline.vue b/packages/frontend/src/views/Timeline.vue
index d8e264ce0..03230c985 100644
--- a/packages/frontend/src/views/Timeline.vue
+++ b/packages/frontend/src/views/Timeline.vue
@@ -195,19 +195,9 @@ export default {
           if (newItems.length === 0) $state.complete()
           else $state.loaded()
 
-          return {
-            user: {
-              __typename: previousResult.user.__typename,
-              id: previousResult.user.id,
-              timeline: {
-                __typename: previousResult.user.timeline.__typename,
-                totalCount: fetchMoreResult.user.timeline.totalCount,
-                cursor: fetchMoreResult.user.timeline.cursor,
-                // Merging the new timeline
-                items: [...previousResult.user.timeline.items, ...newItems]
-              }
-            }
-          }
+          fetchMoreResult.user.timeline.items = [...previousResult.user.timeline.items, ...newItems]
+
+          return fetchMoreResult
         }
       })
     }
diff --git a/packages/frontend/src/views/stream/Activity.vue b/packages/frontend/src/views/stream/Activity.vue
index 90ee18452..bbb352004 100644
--- a/packages/frontend/src/views/stream/Activity.vue
+++ b/packages/frontend/src/views/stream/Activity.vue
@@ -12,6 +12,13 @@
           :activity="activity"
           class="my-1"
         ></list-item-activity>
+        <infinite-loading
+          v-if="stream.activity && stream.activity.items.length < stream.activity.totalCount"
+          @infinite="infiniteHandler"
+        >
+          <div slot="no-more">This is all your activity!</div>
+          <div slot="no-results">There are no ctivities to load</div>
+        </infinite-loading>
       </v-timeline>
       <v-timeline v-else-if="$apollo.loading" align-top :dense="$vuetify.breakpoint.mobile">
         <v-timeline-item v-for="i in 6" :key="i" medium>
@@ -69,6 +76,30 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    infiniteHandler($state) {
+      this.$apollo.queries.stream.fetchMore({
+        variables: {
+          before: this.stream.activity.cursor
+        },
+        // Transform the previous result with new data
+        updateQuery: (previousResult, { fetchMoreResult }) => {
+          const newItems = fetchMoreResult.stream.activity.items
+
+          //set vue-infinite state
+          if (newItems.length === 0) $state.complete()
+          else $state.loaded()
+
+          fetchMoreResult.stream.activity.items = [
+            ...previousResult.stream.activity.items,
+            ...newItems
+          ]
+
+          return fetchMoreResult
+        }
+      })
+    }
   }
 }
 </script>