diff --git a/lib/entry/libimagentryannotation/src/annotation_fetcher.rs b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
index b4415466..ef98bdfd 100644
--- a/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
+++ b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
@@ -31,9 +31,7 @@ pub trait AnnotationFetcher<'a> {
 impl<'a> AnnotationFetcher<'a> for Store {
 
     fn all_annotations(&'a self) -> Result<AnnotationIter<'a>> {
-        self.retrieve_for_module("annotations")
-            .map(|iter| AnnotationIter::new(iter, self))
-            .map_err(Into::into)
+        Ok(AnnotationIter::new(self.entries()?.without_store(), self))
     }
 
 }