diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
index afd6d2265a2..b4ef2c983aa 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
@@ -254,6 +254,9 @@ void BlackBerryDeviceConfigurationWizardQueryPage::processQueryFinished(int stat
     m_holder.devicePin = m_deviceInformation->devicePin();
     m_holder.scmBundle = m_deviceInformation->scmBundle();
     m_holder.deviceName = m_deviceInformation->hostName();
+    if (m_holder.deviceName.isEmpty())
+        m_holder.deviceName = QLatin1String("BlackBerry at ")
+                + field(QLatin1String(DEVICEHOSTNAME_FIELD_ID)).toString();
     m_holder.debugTokenAuthor = m_deviceInformation->debugTokenAuthor();
     m_holder.debugTokenValid = m_deviceInformation->debugTokenValid();
     m_holder.isSimulator = m_deviceInformation->isSimulator();