diff --git a/mod/glossary/dynalink.php b/mod/glossary/dynalink.php
index f41df570331..b42571a4bd7 100644
--- a/mod/glossary/dynalink.php
+++ b/mod/glossary/dynalink.php
@@ -78,7 +78,9 @@
                             if ( $aliases = get_records("glossary_alias","entryid",$concept->id, "alias") ) {
                                 foreach ($aliases as $alias) {
                                     $currentalias = glossary_addslashes($replace,$alias->alias);
-                                    $currentconcept .= "|" . trim($currentalias);
+                                    if ( trim( $currentalias ) != '' ) {
+                                        $currentconcept .= "|" . trim($currentalias);
+                                    }
                                 }
                             }
                         }
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index ee26b9db863..6308183a2e6 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -515,7 +515,7 @@ function  glossary_print_entry_aliases($course, $cm, $glossary, $entry,$mode="",
     $return = '';
     if ( $aliases = get_records("glossary_alias","entryid",$entry->id) ) {
         foreach ($aliases as $alias) {
-            if ($alias->alias) {
+            if (trim($alias->alias)) {
                 if ($return == '') {
                     $return = '<select style="font-size:8pt">';
                 }