diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 89a13bb4..246df823 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1479,6 +1479,8 @@ error:
   end_server(mysql);
   /* only free the allocated memory, user needs to call mysql_close */
   mysql_close_memory(mysql);
+  if (!(client_flag & CLIENT_REMEMBER_OPTIONS))
+    mysql_close_options(mysql);
   return(0);
 }