diff --git a/pkg/rpc/blob_datasource.go b/pkg/rpc/blob_datasource.go
index 511a2003a..0c7580d85 100644
--- a/pkg/rpc/blob_datasource.go
+++ b/pkg/rpc/blob_datasource.go
@@ -78,8 +78,7 @@ func (ds *BlobDataSource) GetBlobs(
 			}
 		}
 	}
-	err = nil
-	return sidecars, err
+	return sidecars, nil
 }
 
 // getBlobFromServer get blob data from server path `/getBlob`.
diff --git a/pkg/rpc/subscription.go b/pkg/rpc/subscription.go
index 80b28d3e6..384ba8efa 100644
--- a/pkg/rpc/subscription.go
+++ b/pkg/rpc/subscription.go
@@ -124,6 +124,6 @@ func waitSubErr(ctx context.Context, sub event.Subscription) (event.Subscription
 	case err := <-sub.Err():
 		return sub, err
 	case <-ctx.Done():
-		return sub, nil
+		return sub, ctx.Err()
 	}
 }