diff --git a/CHANGELOG.md b/CHANGELOG.md
index eff8bc3518..d72a9b387e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - **Breaking**: Renamed `WakuRelay.(add|delete)PrivateDecryptionKey` to `WakuRelay.(add|delete)DecryptionKey` to make it clearer that it accepts both symmetric keys and asymmetric private keys.
 
-### Fix
+### Fixed
 - Align `WakuMessage` readme example with actual code behaviour.
 - Remove infinite loop when an error with Waku Store is encountered.
 
diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts
index 0d757daab9..83a3966f5c 100644
--- a/src/lib/waku_store/index.ts
+++ b/src/lib/waku_store/index.ts
@@ -168,15 +168,18 @@ export class WakuStore {
             }
           } catch (err) {
             console.log('Failed to decode store reply', err);
+            return null;
           }
         } catch (err) {
           console.log('Failed to send waku store query', err);
+          return null;
         }
       } catch (err) {
         console.log(
           'Failed to negotiate waku store protocol stream with peer',
           err
         );
+        return null;
       }
     }
   }