diff --git a/src/useFilterMessages.ts b/src/useFilterMessages.ts
index 716156c..01db809 100644
--- a/src/useFilterMessages.ts
+++ b/src/useFilterMessages.ts
@@ -14,7 +14,7 @@ type AbstractFilterNode = Waku & {
 
 type UseFilterMessagesParams = {
   node: undefined | AbstractFilterNode;
-  decoder: IDecoder<IDecodedMessage>;
+  decoder: undefined | IDecoder<IDecodedMessage>;
 };
 
 type UseFilterMessagesResult = HookState & {
@@ -42,7 +42,7 @@ export const useFilterMessages = (
   );
 
   React.useEffect(() => {
-    if (!node) {
+    if (!node || !decoder) {
       return;
     }
 
diff --git a/src/useStoreMessages.ts b/src/useStoreMessages.ts
index 7dff9fe..c9168af 100644
--- a/src/useStoreMessages.ts
+++ b/src/useStoreMessages.ts
@@ -15,7 +15,7 @@ type AbstractStoreNode = Waku & {
 
 type UseStoreMessagesParams = {
   node: undefined | AbstractStoreNode;
-  decoder: IDecoder<IDecodedMessage>;
+  decoder: undefined | IDecoder<IDecodedMessage>;
   options: StoreQueryOptions;
 };
 
@@ -44,7 +44,7 @@ export const useStoreMessages = (
   );
 
   React.useEffect(() => {
-    if (!node) {
+    if (!node || !decoder) {
       return;
     }