diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## 0.53.1
+### Fixed
+- Return 404 in case of bad address.
+
 ## 0.53.0
 ### Added
 - Blockchain.info endpoint: `q/addresstohash/:addr`.
diff --git a/haskoin-store.cabal b/haskoin-store.cabal
--- a/haskoin-store.cabal
+++ b/haskoin-store.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 9d8726bf55fae317b2fcd51fdd5dd431863f91b34816fc3aa9064e3de0215a55
+-- hash: e2e972c65bb4fdaa07911345e1dff14476440ef8e22f7030a59eb3492a65582f
 
 name:           haskoin-store
-version:        0.53.0
+version:        0.53.1
 synopsis:       Storage and index for Bitcoin and Bitcoin Cash
 description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-store#readme>
 category:       Bitcoin, Finance, Network
@@ -62,7 +62,7 @@
     , hashable >=1.3.0.0
     , haskoin-core >=0.19.0
     , haskoin-node >=0.17.0
-    , haskoin-store-data ==0.53.0
+    , haskoin-store-data ==0.53.1
     , hedis >=0.12.13
     , http-types >=0.12.3
     , lens >=4.18.1
@@ -116,7 +116,7 @@
     , haskoin-core >=0.19.0
     , haskoin-node >=0.17.0
     , haskoin-store
-    , haskoin-store-data ==0.53.0
+    , haskoin-store-data ==0.53.1
     , hedis >=0.12.13
     , http-types >=0.12.3
     , lens >=4.18.1
@@ -175,7 +175,7 @@
     , haskoin-core >=0.19.0
     , haskoin-node >=0.17.0
     , haskoin-store
-    , haskoin-store-data ==0.53.0
+    , haskoin-store-data ==0.53.1
     , hedis >=0.12.13
     , hspec >=2.7.1
     , http-types >=0.12.3
diff --git a/src/Haskoin/Store/Web.hs b/src/Haskoin/Store/Web.hs
--- a/src/Haskoin/Store/Web.hs
+++ b/src/Haskoin/Store/Web.hs
@@ -1477,13 +1477,13 @@
         Nothing -> raise rawaddrStat ThingNotFound
         Just a  -> return a
 
-getBinfoAddr :: Monad m => TL.Text -> WebT m (Maybe BinfoAddr)
+getBinfoAddr :: Monad m => TL.Text -> WebT m BinfoAddr
 getBinfoAddr param' = do
     txt <- S.param param'
     net <- lift $ asks (storeNetwork . webStore . webConfig)
-    return $
-        BinfoAddr <$> textToAddr net txt <|>
-        BinfoXpub <$> xPubImport net txt
+    let x = BinfoAddr <$> textToAddr net txt <|>
+            BinfoXpub <$> xPubImport net txt
+    maybe S.next return x
 
 scottyBinfoHistory :: (MonadUnliftIO m, MonadLoggerIO m) => WebT m ()
 scottyBinfoHistory =
@@ -1758,12 +1758,8 @@
 scottyRawAddr =
     setMetrics rawaddrStat 1 >>
     getBinfoAddr "addr" >>= \case
-        Just b -> case b of
-            BinfoAddr addr -> do_addr addr
-            BinfoXpub xpub -> do_xpub xpub
-        Nothing ->
-            raise rawaddrStat $
-            UserError "could not decode address provided"
+    BinfoAddr addr -> do_addr addr
+    BinfoXpub xpub -> do_xpub xpub
   where
     do_xpub xpub = do
         numtxid <- getNumTxId