diff --git a/src/glossarium.typ b/src/glossarium.typ
index cc01e0f..5b1a8de 100644
--- a/src/glossarium.typ
+++ b/src/glossarium.typ
@@ -170,7 +170,13 @@ SOFTWARE.*/
             numbering: none,
             caption: {
               context {
-                let term_references = __query_labels_with_key(here(), entry.key)
+                let key = if entry.key.ends-with("__glossary_entry") {
+                  entry.key.replace("__glossary_entry", "")
+                } else {
+                  entry.key
+                }
+
+                let term_references = __query_labels_with_key(here(), key)
                 if term_references.len() != 0 or show-all [
                   #let desc = entry.at("desc", default: "")
                   #let long = entry.at("long", default: "")
diff --git a/src/lib.typ b/src/lib.typ
index 0cde410..348265e 100644
--- a/src/lib.typ
+++ b/src/lib.typ
@@ -93,7 +93,7 @@
 
     #if "glossary" in config.thesis and config.thesis.glossary != none {
       print-glossary(
-        show-all: true,
+        show-all: false,
         disable-back-references: true,
         enable-group-pagebreak: true,
         glossary(config.thesis.glossary, config),