diff --git a/Makefile b/Makefile
index f24ef87a..b8687739 100644
--- a/Makefile
+++ b/Makefile
@@ -17,5 +17,6 @@ lint-install:
 lint:
 	@echo "lint"
 	@golangci-lint --exclude=SA1019 run ./... --deadline=5m
+
 test:
 	go test -v -failfast ./...
diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index 4e91bce1..3fd4fdc8 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -522,7 +522,10 @@ func (node *WakuNode) UnsubscribeFilter(ctx context.Context, topic string, conte
 		}
 
 		// Send message to full node in order to unsubscribe
-		node.filter.Unsubscribe(ctx, topic, contentTopics, f.PeerID)
+		err := node.filter.Unsubscribe(ctx, topic, contentTopics, f.PeerID)
+		if err != nil {
+			return err
+		}
 
 		// Iterate filter entries to remove matching content topics
 		// make sure we delete the content filter