diff --git a/dbutils.c b/dbutils.c
index 5cc82397..9756aa2d 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -210,7 +210,7 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 											  strlen(schema_str));
 
 		maxlen_snprintf(schema_quoted, "%s", identifier);
-		free(identifier);
+		PQfreemem(identifier);
 	}
 
 	/* find all nodes belonging to this cluster */
diff --git a/repmgr.c b/repmgr.c
index e1120f72..45626bbe 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -349,7 +349,7 @@ do_master_register(void)
 											  strlen(schema_str));
 
 		maxlen_snprintf(schema_quoted, "%s", identifier);
-		free(identifier);
+		PQfreemem(identifier);
 	}
 
 	/* Check if there is a schema for this cluster */
@@ -537,7 +537,7 @@ do_standby_register(void)
 											  strlen(schema_str));
 
 		maxlen_snprintf(schema_quoted, "%s", identifier);
-		free(identifier);
+		PQfreemem(identifier);
 	}
 
 	/* Check if there is a schema for this cluster */