diff --git a/db/db.go b/db/db.go
index efe3a8250..4e01dc965 100644
--- a/db/db.go
+++ b/db/db.go
@@ -6164,3 +6164,28 @@ func RemovePoisonedCg(stationId int, cgName string) error {
 
 	return nil
 }
+
+func DeleteConfByTenantName(tenantName string) error {
+	ctx, cancelfunc := context.WithTimeout(context.Background(), DbOperationTimeout*time.Second)
+	defer cancelfunc()
+
+	conn, err := MetadataDbClient.Client.Acquire(ctx)
+	if err != nil {
+		return err
+	}
+	defer conn.Release()
+
+	query := `DELETE FROM configurations
+	WHERE tenant_name=$1`
+
+	stmt, err := conn.Conn().Prepare(ctx, "remove_conf_by_tenant_name", query)
+	if err != nil {
+		return err
+	}
+	tenantName = strings.ToLower(tenantName)
+	_, err = conn.Conn().Exec(ctx, stmt.Name, tenantName)
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/server/memphis_handlers_user_mgmt.go b/server/memphis_handlers_user_mgmt.go
index 52e47ec90..c7cac26bb 100644
--- a/server/memphis_handlers_user_mgmt.go
+++ b/server/memphis_handlers_user_mgmt.go
@@ -162,6 +162,11 @@ func removeTenantResources(tenantName string, user models.User) error {
 
 	SendUserDeleteCacheUpdate(users_list, tenantName)
 
+	err = db.DeleteConfByTenantName(tenantName)
+	if err != nil {
+		return err
+	}
+
 	err = db.RemoveTenant(tenantName)
 	if err != nil {
 		return err