diff --git a/dist/bundle.es.js b/dist/bundle.es.js
index 9bb07c2..1937fbb 100644
--- a/dist/bundle.es.js
+++ b/dist/bundle.es.js
@@ -3313,13 +3313,11 @@ const doCheckPendingTxs = () => (dispatch, getState) => {
       if (noLongerPendingConsolidate.length) {
         if (noLongerPendingConsolidate.includes(pendingConsTxid)) {
           dispatch(doToast({
-            title: __('Wallet Job'),
             message: __('Your wallet is finished consolidating')
           }));
         }
         if (noLongerPendingConsolidate.includes(pendingMassCLaimTxid)) {
           dispatch(doToast({
-            title: __('Wallet Job'),
             message: __('Your tips have been collected')
           }));
         }
@@ -5001,7 +4999,8 @@ function handleClaimAction(state, action) {
 
   Object.entries(resolveInfo).forEach(([url, resolveResponse]) => {
     // $FlowFixMe
-    const { claimsInChannel, stream, channel } = resolveResponse;
+    const { claimsInChannel, stream, channel: channelFromResolve } = resolveResponse;
+    const channel = channelFromResolve || stream && stream.signing_channel;
 
     if (stream) {
       if (pendingIds.includes(stream.claim_id)) {
diff --git a/src/redux/reducers/claims.js b/src/redux/reducers/claims.js
index 7582a9e..1b77d3a 100644
--- a/src/redux/reducers/claims.js
+++ b/src/redux/reducers/claims.js
@@ -119,7 +119,8 @@ function handleClaimAction(state: State, action: any): State {
 
   Object.entries(resolveInfo).forEach(([url: string, resolveResponse: ResolveResponse]) => {
     // $FlowFixMe
-    const { claimsInChannel, stream, channel } = resolveResponse;
+    const { claimsInChannel, stream, channel: channelFromResolve } = resolveResponse;
+    const channel = channelFromResolve || (stream && stream.signing_channel);
 
     if (stream) {
       if (pendingIds.includes(stream.claim_id)) {
@@ -570,7 +571,10 @@ reducers[ACTIONS.CLAIM_SEARCH_FAILED] = (state: State, action: any): State => {
   const { query } = action.data;
   const claimSearchByQuery = Object.assign({}, state.claimSearchByQuery);
   const fetchingClaimSearchByQuery = Object.assign({}, state.fetchingClaimSearchByQuery);
-  const claimSearchByQueryLastPageReached = Object.assign({}, state.claimSearchByQueryLastPageReached);
+  const claimSearchByQueryLastPageReached = Object.assign(
+    {},
+    state.claimSearchByQueryLastPageReached
+  );
 
   delete fetchingClaimSearchByQuery[query];