diff --git a/components/Public.tsx b/components/Public.tsx
index 8885446..2035db7 100644
--- a/components/Public.tsx
+++ b/components/Public.tsx
@@ -23,14 +23,14 @@ export const PublicNetworkView = ({ data, domain }: { data: GeoData, domain: str
         <InfoRow
           icon={GlobeAltIcon}
           label="Hostname"
-          value={domain}
+          value={data.hostname || 'N/A'}
           canCopy
           iconColor="text-indigo-500"
         />
         <InfoRow
           icon={MapPinIcon}
           label="Location"
-          value={data.countryName || 'Unknown Location'}
+          value={data.countryName || 'N/A'}
           iconColor="text-emerald-500"
         />
         <InfoRow
diff --git a/services/geo.ts b/services/geo.ts
index 2101a42..18e6568 100644
--- a/services/geo.ts
+++ b/services/geo.ts
@@ -30,6 +30,7 @@ export const GeoService = {
       console.warn('Geo lookup failed for', ip, error);
       return {
         ip,
+        hostname: null,
         countryCode: null,
         countryName: 'Unknown',
         city: null,
@@ -46,6 +47,7 @@ export const GeoService = {
   getLocalData(ip: string): GeoData {
     return {
       ip,
+      hostname: null,
       countryCode: null,
       countryName: 'Local Network',
       city: null,
@@ -61,6 +63,7 @@ export const GeoService = {
   transform(ip: string, apiData: any): GeoData {
     return {
       ip,
+      hostname: apiData.hostname || null,
       countryCode: apiData.country || null,
       countryName: apiData.country ? (codes[apiData.country.toLowerCase()] || apiData.country) : null,
       city: apiData.city || null,
diff --git a/utils/types.ts b/utils/types.ts
index a4ee09d..959f1cd 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -1,5 +1,6 @@
 export interface GeoData {
   ip: string;
+  hostname: string | null;
   countryCode: string | null;
   countryName: string | null;
   city: string | null;