diff --git a/package-lock.json b/package-lock.json
index 8c056fe..a58c1f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.6.26",
+  "version": "2.6.27",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.6.26",
+      "version": "2.6.27",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
diff --git a/package.json b/package.json
index f695ef7..293046b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.6.26",
+  "version": "2.6.27",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json
index e02a8bb..b8090c4 100644
--- a/public/locales/de/translation.json
+++ b/public/locales/de/translation.json
@@ -719,9 +719,9 @@
 	"telemetry": {
 		"connection_failed": "Verbindung konnte nicht hergestellt werden. Fehler: {{error}}",
 		"interval": "Intervall",
+		"last_update": "Letztes Update",
 		"lifetime": "Dauer",
 		"outputmode": "Ausgabemodus",
-		"last_update": "Letztes Update",
 		"types": "Typen"
 	},
 	"trace": {
@@ -816,6 +816,7 @@
 		"radios": "Radios",
 		"scan_warning": "Ihr 5G-Funkgerät befindet sich auf einem Radarkanal, Sie müssen „Override DFS“ aktivieren, um das Scannen aller 5G-Kanäle zu ermöglichen",
 		"title": "WLAN-Analyse",
-		"vendor": "Verkäufer"
+		"vendor": "Verkäufer",
+		"waiting_for_data": "Warten auf Empfang von Gerätedaten. Bitte schauen Sie später noch einmal nach"
 	}
 }
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index e9c8411..4b20d72 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -719,9 +719,9 @@
 	"telemetry": {
 		"connection_failed": "Failed to create connection. Error: {{error}}",
 		"interval": "Interval",
+		"last_update": "Last Update",
 		"lifetime": "Duration",
 		"outputmode": "Output Mode",
-		"last_update": "Last Update",
 		"types": "Types"
 	},
 	"trace": {
@@ -816,6 +816,7 @@
 		"radios": "Radios",
 		"scan_warning": "Your 5G radio is on a radar channel, you must enable “Override DFS” to allow scanning of all 5G channels",
 		"title": "Wi-Fi Analysis",
-		"vendor": "Vendor"
+		"vendor": "Vendor",
+		"waiting_for_data": "Waiting to receive device data. Please check again later"
 	}
 }
diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json
index e2b5909..83f4785 100644
--- a/public/locales/es/translation.json
+++ b/public/locales/es/translation.json
@@ -719,9 +719,9 @@
 	"telemetry": {
 		"connection_failed": "No se pudo crear la conexión. Error: {{error}}",
 		"interval": "intervalo",
+		"last_update": "Última actualización",
 		"lifetime": "Duración",
 		"outputmode": "Modo salida",
-		"last_update": "Última actualización",
 		"types": "Los tipos"
 	},
 	"trace": {
@@ -816,6 +816,7 @@
 		"radios": "Radios",
 		"scan_warning": "Su radio 5G está en un canal de radar, debe habilitar \"Anular DFS\" para permitir el escaneo de todos los canales 5G",
 		"title": "Análisis de Wi-Fi",
-		"vendor": "Vendedor"
+		"vendor": "Vendedor",
+		"waiting_for_data": "Esperando recibir datos del dispositivo. Vuelva a consultar más tarde"
 	}
 }
diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
index 3b6bd45..995f430 100644
--- a/public/locales/fr/translation.json
+++ b/public/locales/fr/translation.json
@@ -719,9 +719,9 @@
 	"telemetry": {
 		"connection_failed": "Échec de la création de la connexion. Erreur : {{error}}",
 		"interval": "Intervalle",
+		"last_update": "Dernière mise à jour",
 		"lifetime": "Durée",
 		"outputmode": "Mode de sortie",
-		"last_update": "Dernière mise à jour",
 		"types": "Les types"
 	},
 	"trace": {
@@ -816,6 +816,7 @@
 		"radios": "Radios",
 		"scan_warning": "Votre radio 5G est sur un canal radar, vous devez activer \"Override DFS\" pour permettre le balayage de tous les canaux 5G",
 		"title": "Analyse Wi-Fi",
-		"vendor": "vendeur"
+		"vendor": "vendeur",
+		"waiting_for_data": "En attente de réception des données de l'appareil. Veuillez revérifier plus tard"
 	}
 }
diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json
index 00f247e..afc01fa 100644
--- a/public/locales/pt/translation.json
+++ b/public/locales/pt/translation.json
@@ -719,9 +719,9 @@
 	"telemetry": {
 		"connection_failed": "Falha ao criar conexão. Erro: {{error}}",
 		"interval": "intervalo",
+		"last_update": "Última atualização",
 		"lifetime": "Duração",
 		"outputmode": "Modo saída",
-		"last_update": "Última atualização",
 		"types": "Tipos"
 	},
 	"trace": {
@@ -816,6 +816,7 @@
 		"radios": "Rádios",
 		"scan_warning": "Seu rádio 5G está em um canal de radar, você deve habilitar “Override DFS” para permitir a varredura de todos os canais 5G",
 		"title": "Análise de Wi-Fi",
-		"vendor": "fornecedor"
+		"vendor": "fornecedor",
+		"waiting_for_data": "Aguardando para receber dados do dispositivo. Verifique novamente mais tarde"
 	}
 }
diff --git a/src/components/WifiAnalysis/index.js b/src/components/WifiAnalysis/index.js
index eb9c998..0c59e9e 100644
--- a/src/components/WifiAnalysis/index.js
+++ b/src/components/WifiAnalysis/index.js
@@ -238,7 +238,7 @@ const WifiAnalysis = () => {
 
   return (
     <div>
-      <CCard>
+      <CCard className="mb-0">
         <CCardHeader className="dark-header d-flex flex-row-reverse align-items-center">
           <div className="pl-2">
             <CPopover content={t('common.refresh')}>
@@ -254,35 +254,47 @@ const WifiAnalysis = () => {
           </div>
         </CCardHeader>
         <CCardBody>
-          <CRow className="mb-4">
-            <CCol className="text-center">
-              <input
-                type="range"
-                style={{ width: '80%' }}
-                className="form-range"
-                min="0"
-                max={range}
-                step="1"
-                onChange={(e) => updateSelectedStats(e.target.value)}
-                defaultValue={range}
-                disabled={!selectedRadioStats}
-              />
-              <h5>
-                {t('common.timestamp')}: {tableTime}
-              </h5>
-            </CCol>
-          </CRow>
-          <div className="overflow-auto" style={{ height: 'calc(100vh - 300px)' }}>
-            <h5 className="pb-3 text-center">{t('wifi_analysis.radios')}</h5>
-            <RadioAnalysisTable data={selectedRadioStats ?? []} loading={loading} range={range} />
-            <h5 className="pt-5 pb-3 text-center">{t('wifi_analysis.associations')}</h5>
-            <WifiAnalysisTable
-              t={t}
-              data={selectedAssociationStats ?? []}
-              loading={loading}
-              range={range}
-            />
-          </div>
+          {!loading && parsedAssociationStats.length === 0 ? (
+            <div className="text-center">
+              <h3>{t('wifi_analysis.waiting_for_data')}</h3>
+            </div>
+          ) : (
+            <>
+              <CRow className="mb-4">
+                <CCol className="text-center">
+                  <input
+                    type="range"
+                    style={{ width: '80%' }}
+                    className="form-range"
+                    min="0"
+                    max={range}
+                    step="1"
+                    onChange={(e) => updateSelectedStats(e.target.value)}
+                    defaultValue={range}
+                    disabled={!selectedRadioStats}
+                  />
+                  <h5>
+                    {t('common.timestamp')}: {tableTime}
+                  </h5>
+                </CCol>
+              </CRow>
+              <div className="overflow-auto" style={{ height: 'calc(100vh - 300px)' }}>
+                <h5 className="pb-3 text-center">{t('wifi_analysis.radios')}</h5>
+                <RadioAnalysisTable
+                  data={selectedRadioStats ?? []}
+                  loading={loading}
+                  range={range}
+                />
+                <h5 className="pt-5 pb-3 text-center">{t('wifi_analysis.associations')}</h5>
+                <WifiAnalysisTable
+                  t={t}
+                  data={selectedAssociationStats ?? []}
+                  loading={loading}
+                  range={range}
+                />
+              </div>
+            </>
+          )}
         </CCardBody>
       </CCard>
       <CModal size="xl" show={showModal} onClose={toggleModal}>