diff --git a/src/server.c b/src/server.c
index f8b5bfb7..841a1c42 100644
--- a/src/server.c
+++ b/src/server.c
@@ -318,7 +318,7 @@ ssh_get_key_params(ssh_session session,
     }
 
     rc = ssh_dh_import_next_pubkey_blob(session, pubkey_blob);
-    ssh_string_free(pubkey_blob);
+    SSH_STRING_FREE(pubkey_blob);
     if (rc != 0) {
         ssh_set_error(session,
                       SSH_FATAL,
@@ -1032,14 +1032,14 @@ int ssh_message_auth_reply_pk_ok_simple(ssh_message msg) {
 
     ret = ssh_pki_export_pubkey_blob(msg->auth_request.pubkey, &pubkey_blob);
     if (ret < 0) {
-        ssh_string_free(algo);
+        SSH_STRING_FREE(algo);
         return SSH_ERROR;
     }
 
     ret = ssh_message_auth_reply_pk_ok(msg, algo, pubkey_blob);
 
-    ssh_string_free(algo);
-    ssh_string_free(pubkey_blob);
+    SSH_STRING_FREE(algo);
+    SSH_STRING_FREE(pubkey_blob);
 
     return ret;
 }