diff --git a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
index 4ffb3cae..b8d852f1 100644
--- a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
+++ b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx
@@ -100,10 +100,6 @@ const DomainCard = ({
 
       const dnsData = await client.getLatestDNSDataByProjectId(id);
 
-      if (!dnsData || !dnsData.value) {
-        setIPAddress('Not Configured');
-      }
-
       setIPAddress(dnsData.value);
     };
 
@@ -219,7 +215,7 @@ const DomainCard = ({
               <tr>
                 <td>{DOMAIN_RECORD.type}</td>
                 <td>{DOMAIN_RECORD.name}</td>
-                <td>{IPAddress}</td>
+                <td>{IPAddress ?? 'Not Configured'}</td>
               </tr>
             </tbody>
           </table>
diff --git a/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx b/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
index 4b08b74e..a48c1550 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
@@ -76,10 +76,6 @@ const Config = () => {
 
         const dnsData = await client.getLatestDNSDataByProjectId(id);
 
-        if (!dnsData || !dnsData.value) {
-          setIPAddress("Not Configured")
-        }
-
         setIPAddress(dnsData.value);
     };
 
@@ -106,7 +102,7 @@ const Config = () => {
           <Table.Row>
             <Table.RowHeaderCell>A</Table.RowHeaderCell>
             <Table.Cell>@</Table.Cell>
-            <Table.Cell>{IPAddress}</Table.Cell>
+            <Table.Cell>{IPAddress ?? 'Not Configured'}</Table.Cell>
           </Table.Row>
         </Table.Body>
       </Table>