diff --git a/src/command/command.c b/src/command/command.c
index 56d4ba93..2778629e 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -980,6 +980,7 @@ cmd_init(void)
         g_string_free(ac_alias, TRUE);
         curr = g_list_next(curr);
     }
+    prefs_free_aliases(aliases);
 
     prefs_ac = autocomplete_new();
     autocomplete_add(prefs_ac, "ui");
diff --git a/src/config/preferences.c b/src/config/preferences.c
index 3454cf35..363ce859 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -361,11 +361,15 @@ prefs_get_aliases(void)
             char *name = keys[i];
             char *value = g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL);
 
-            ProfAlias *alias = malloc(sizeof(struct prof_alias_t));
-            alias->name = strdup(name);
-            alias->value = strdup(value);
+            if (value != NULL) {
+                ProfAlias *alias = malloc(sizeof(struct prof_alias_t));
+                alias->name = strdup(name);
+                alias->value = strdup(value);
 
-            result = g_list_insert_sorted(result, alias, (GCompareFunc)_alias_cmp);
+                free(value);
+
+                result = g_list_insert_sorted(result, alias, (GCompareFunc)_alias_cmp);
+            }
         }
 
         g_strfreev(keys);