diff --git a/.github/workflows/libnm_proxy_L1_test.yml b/.github/workflows/libnm_proxy_L1_test.yml
index 80d945d5..d947d643 100644
--- a/.github/workflows/libnm_proxy_L1_test.yml
+++ b/.github/workflows/libnm_proxy_L1_test.yml
@@ -111,7 +111,7 @@ jobs:
         run: |
           sudo bash -c 'echo "ETHERNET_INTERFACE=eth0
           WIFI_INTERFACE=wlan0
-          DEVICE_NAME=rdk_test_device " > /etc/device.properties'
+          DEFAULT_HOSTNAME=rdk_test_device " > /etc/device.properties'
 
       - name: Generate IARM headers
         run: |
diff --git a/plugin/gnome/NetworkManagerGnomeProxy.cpp b/plugin/gnome/NetworkManagerGnomeProxy.cpp
index b661a8de..4fec7b5b 100644
--- a/plugin/gnome/NetworkManagerGnomeProxy.cpp
+++ b/plugin/gnome/NetworkManagerGnomeProxy.cpp
@@ -151,6 +151,11 @@ namespace WPEFramework
             if(!nmUtils::readPersistentHostname(hostname))
             {
                 hostname = nmUtils::deviceHostname(); // default hostname as device name
+                if(hostname.empty())
+                {
+                    NMLOG_WARNING("default hostname is empty no modification in nm connections");
+                    return false;
+                }
             }
 
             connections = nm_client_get_connections(client);
diff --git a/plugin/gnome/NetworkManagerGnomeUtils.cpp b/plugin/gnome/NetworkManagerGnomeUtils.cpp
index 7d97e5e8..24900bbf 100644
--- a/plugin/gnome/NetworkManagerGnomeUtils.cpp
+++ b/plugin/gnome/NetworkManagerGnomeUtils.cpp
@@ -261,13 +261,13 @@ namespace WPEFramework
                     }
                 }
 
-                if (line.find("DEVICE_NAME=") != std::string::npos) {
+                if (line.find("DEFAULT_HOSTNAME=") != std::string::npos) {
                     deviceHostname = line.substr(line.find('=') + 1);
                     deviceHostname.erase(deviceHostname.find_last_not_of("\r\n\t") + 1);
                     deviceHostname.erase(0, deviceHostname.find_first_not_of("\r\n\t"));
                     if(deviceHostname.empty())
                     {
-                        NMLOG_WARNING("DEVICE_NAME is empty in /etc/device.properties");
+                        NMLOG_WARNING("DEFAULT_HOSTNAME is empty in /etc/device.properties");
                         deviceHostname = ""; // set empty device name
                     }
                 }
diff --git a/plugin/gnome/NetworkManagerGnomeWIFI.cpp b/plugin/gnome/NetworkManagerGnomeWIFI.cpp
index 2348124d..00fc9751 100644
--- a/plugin/gnome/NetworkManagerGnomeWIFI.cpp
+++ b/plugin/gnome/NetworkManagerGnomeWIFI.cpp
@@ -637,18 +637,27 @@ namespace WPEFramework
                 NMLOG_DEBUG("No persistent hostname found, using device hostname");
             }
 
+            if(hostname.empty())
+                NMLOG_WARNING("dhcp hostname: <empty>");
+            else
+                NMLOG_INFO("dhcp hostname: %s", hostname.c_str());
+
             // IPv4 settings with DHCP
             NMSettingIP4Config *sIpv4 = (NMSettingIP4Config *)nm_setting_ip4_config_new();
             g_object_set(G_OBJECT(sIpv4), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL);
-            g_object_set(G_OBJECT(sIpv4), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
-            g_object_set(G_OBJECT(sIpv4), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL);
+            if(!hostname.empty()) {
+                g_object_set(G_OBJECT(sIpv4), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
+                g_object_set(G_OBJECT(sIpv4), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL);
+            }
             nm_connection_add_setting(connection, NM_SETTING(sIpv4));
 
             // IPv6 settings with DHCP
             NMSettingIP6Config *sIpv6 = (NMSettingIP6Config *)nm_setting_ip6_config_new();
             g_object_set(G_OBJECT(sIpv6), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL);
-            g_object_set(G_OBJECT(sIpv6), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
-            g_object_set(G_OBJECT(sIpv6), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL);
+            if(!hostname.empty()) {
+                g_object_set(G_OBJECT(sIpv6), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
+                g_object_set(G_OBJECT(sIpv6), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL);
+            }
             nm_connection_add_setting(connection, NM_SETTING(sIpv6));
 
             NMLOG_DEBUG("Created minimal ethernet connection with autoconnect=true");
@@ -894,23 +903,30 @@ namespace WPEFramework
             if(!nmUtils::readPersistentHostname(hostname))
             {
                 hostname = nmUtils::deviceHostname();
-                NMLOG_DEBUG("no persistent hostname found taking device name as hostname !");
+                NMLOG_DEBUG("No persistent hostname found, using device hostname");
             }
 
-            NMLOG_INFO("dhcp hostname: %s", hostname.c_str());
+            if(hostname.empty())
+                NMLOG_WARNING("dhcp hostname: <empty>");
+            else
+                NMLOG_INFO("dhcp hostname: %s", hostname.c_str());
 
             /* Build up the 'IPv4' Setting */
             NMSettingIP4Config *sIpv4Conf = (NMSettingIP4Config *) nm_setting_ip4_config_new();
             g_object_set(G_OBJECT(sIpv4Conf), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); // autoconf = true
-            g_object_set(G_OBJECT(sIpv4Conf), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
-            g_object_set(G_OBJECT(sIpv4Conf), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL); // hostname send enabled
+            if(!hostname.empty()) {
+                g_object_set(G_OBJECT(sIpv4Conf), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
+                g_object_set(G_OBJECT(sIpv4Conf), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL); // hostname send enabled
+            }
             nm_connection_add_setting(m_connection, NM_SETTING(sIpv4Conf));
 
             /* Build up the 'IPv6' Setting */
             NMSettingIP6Config *sIpv6Conf = (NMSettingIP6Config *) nm_setting_ip6_config_new();
             g_object_set(G_OBJECT(sIpv6Conf), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL); // autoconf = true
-            g_object_set(G_OBJECT(sIpv6Conf), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
-            g_object_set(G_OBJECT(sIpv6Conf), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL); // hostname send enabled
+            if(!hostname.empty()) {
+                g_object_set(G_OBJECT(sIpv6Conf), NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname.c_str(), NULL);
+                g_object_set(G_OBJECT(sIpv6Conf), NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, TRUE, NULL); // hostname send enabled
+            }
             nm_connection_add_setting(m_connection, NM_SETTING(sIpv6Conf));
             return true;
         }