diff --git a/libervia/backend/plugins/plugin_xep_0384.py b/libervia/backend/plugins/plugin_xep_0384.py
index 8d005c35..f771d7f0 100644
--- a/libervia/backend/plugins/plugin_xep_0384.py
+++ b/libervia/backend/plugins/plugin_xep_0384.py
@@ -186,6 +186,10 @@ class StorageImpl(omemo.Storage):
             return omemo.Just(await self.__storage[key])
         except KeyError:
             return omemo.Nothing()
+        except ValueError as e:
+            # Corrupted data in the database, we return empty to trigger key regeneration.
+            log.error(f"Corrupted OMEMO storage data for key {key!r}: {e}")
+            return omemo.Nothing()
         except Exception as e:
             raise omemo.StorageException(f"Error while loading key {key}") from e