diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts
index b2b03fd54..88e6bd01f 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts
@@ -14,13 +14,21 @@ export const load = async ({ parent, depends, url, route }) => {
     const offset = pageToOffset(page, limit);
     const { domain } = await parent();
 
+    const records = await sdk.forConsole.domains.listRecords({
+        domainId: domain.$id,
+        queries: [Query.offset(offset), Query.limit(limit)]
+    });
+
+    records.dnsRecords = records.dnsRecords.sort((a, b) => {
+        return (
+            Number(b.lock) - Number(a.lock) || Date.parse(b.$createdAt) - Date.parse(a.$createdAt)
+        );
+    });
+
     return {
-        domain,
-        recordList: await sdk.forConsole.domains.listRecords({
-            domainId: domain.$id,
-            queries: [Query.offset(offset), Query.limit(limit)]
-        }),
+        limit,
         offset,
-        limit
+        domain,
+        recordList: records
     };
 };
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte
index 307d6c1e7..f313f7073 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte
@@ -98,7 +98,7 @@
             </Input.Helper>
         </Layout.Stack>
 
-        <InputText id="value" label="Value" {placeholder} bind:value>
+        <InputText id="value" label="Value" {placeholder} bind:value required>
             <Tooltip slot="info">
                 <Icon icon={IconInfo} size="s" />
                 <span slot="tooltip">