diff --git a/framework/python/src/net_orc/ip_control.py b/framework/python/src/net_orc/ip_control.py
index fdd162a29..abefe6b09 100644
--- a/framework/python/src/net_orc/ip_control.py
+++ b/framework/python/src/net_orc/ip_control.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """IP Control Module"""
-import subprocess
 import psutil
 import typing as t
 from common import logger
diff --git a/modules/ui/src/app/app.store.spec.ts b/modules/ui/src/app/app.store.spec.ts
index c2110f81f..7d114e8be 100644
--- a/modules/ui/src/app/app.store.spec.ts
+++ b/modules/ui/src/app/app.store.spec.ts
@@ -165,7 +165,7 @@ describe('AppStore', () => {
           isMenuOpen: true,
           interfaces: {},
           settingMissedError: null,
-          hasInternetConnection: true,
+          hasInternetConnection: null,
         });
         done();
       });
diff --git a/modules/ui/src/app/app.store.ts b/modules/ui/src/app/app.store.ts
index f7ab8e7fc..3584ec8d1 100644
--- a/modules/ui/src/app/app.store.ts
+++ b/modules/ui/src/app/app.store.ts
@@ -250,7 +250,7 @@ export class AppStore extends ComponentStore<AppComponentState> {
       consentShown: sessionStorage.getItem(CONSENT_SHOWN_KEY) !== null,
       isStatusLoaded: false,
       systemStatus: null,
-      hasInternetConnection: true,
+      hasInternetConnection: null,
     });
   }
 }
diff --git a/modules/ui/src/app/components/wifi/wifi.component.html b/modules/ui/src/app/components/wifi/wifi.component.html
index 913112b31..c93d05f7e 100644
--- a/modules/ui/src/app/components/wifi/wifi.component.html
+++ b/modules/ui/src/app/components/wifi/wifi.component.html
@@ -16,9 +16,9 @@
 <button
   mat-icon-button
   class="app-toolbar-button wifi-button"
-  [attr.aria-label]="getLabel(on)"
-  [disabled]="disable"
-  [matTooltip]="getLabel(on)">
+  [attr.aria-label]="getLabel(on, disable)"
+  [class.disabled]="disable"
+  [matTooltip]="getLabel(on, disable)">
   <mat-icon>
     {{ on === true || on === null ? 'wifi' : 'wifi_off' }}
   </mat-icon>
diff --git a/modules/ui/src/app/components/wifi/wifi.component.scss b/modules/ui/src/app/components/wifi/wifi.component.scss
index 4944a5767..bc0ac542e 100644
--- a/modules/ui/src/app/components/wifi/wifi.component.scss
+++ b/modules/ui/src/app/components/wifi/wifi.component.scss
@@ -16,6 +16,7 @@
 @import '../../../theming/colors';
 
 $icon-size: 24px;
+
 .app-toolbar-button {
   border-radius: 20px;
   border: 1px solid transparent;
@@ -25,6 +26,9 @@ $icon-size: 24px;
   height: 34px;
   margin: 11px 0;
   line-height: 50% !important;
+  &.disabled {
+    opacity: 0.6;
+  }
 }
 
 .wifi-icon {
diff --git a/modules/ui/src/app/components/wifi/wifi.component.spec.ts b/modules/ui/src/app/components/wifi/wifi.component.spec.ts
index b848b33e2..55e85a6a7 100644
--- a/modules/ui/src/app/components/wifi/wifi.component.spec.ts
+++ b/modules/ui/src/app/components/wifi/wifi.component.spec.ts
@@ -40,13 +40,25 @@ describe('WifiComponent', () => {
   describe('Class tests', () => {
     describe('with internet connection', () => {
       it('should return label', () => {
-        expect(component.getLabel(true)).toEqual('Internet connection');
+        expect(component.getLabel(true)).toEqual(
+          'Testrun detects a working internet connection for the device under test.'
+        );
       });
     });
 
-    describe('should have no wifi icon', () => {
+    describe('with no internet connection', () => {
+      it('should return label', () => {
+        expect(component.getLabel(false)).toEqual(
+          'No internet connection detected for the device under test.'
+        );
+      });
+    });
+
+    describe('with N/A internet connection', () => {
       it('should return label', () => {
-        expect(component.getLabel(false)).toEqual('No Internet connection');
+        expect(component.getLabel(false, true)).toEqual(
+          'Internet connection is not being monitored.'
+        );
       });
     });
   });
@@ -74,7 +86,7 @@ describe('WifiComponent', () => {
       });
     });
 
-    it(' button should be disables', () => {
+    it('button should be disabled', () => {
       component.disable = true;
       fixture.detectChanges();
 
@@ -82,7 +94,7 @@ describe('WifiComponent', () => {
         '.wifi-button'
       ) as HTMLButtonElement;
 
-      expect(shutdownButton.disabled).toBeTrue();
+      expect(shutdownButton?.classList.contains('disabled')).toBeTrue();
     });
   });
 });
diff --git a/modules/ui/src/app/components/wifi/wifi.component.ts b/modules/ui/src/app/components/wifi/wifi.component.ts
index 084acbc56..e7e28e8f9 100644
--- a/modules/ui/src/app/components/wifi/wifi.component.ts
+++ b/modules/ui/src/app/components/wifi/wifi.component.ts
@@ -26,10 +26,15 @@ import { MatButton, MatIconButton } from '@angular/material/button';
   styleUrl: './wifi.component.scss',
 })
 export class WifiComponent {
-  @Input() on: boolean | null = true;
+  @Input() on: boolean | null = null;
   @Input() disable: boolean = false;
 
-  getLabel(on: boolean | null) {
-    return on ? 'Internet connection' : 'No Internet connection';
+  getLabel(on: boolean | null, disable: boolean = false) {
+    if (disable) {
+      return 'Internet connection is not being monitored.';
+    }
+    return on
+      ? 'Testrun detects a working internet connection for the device under test.'
+      : 'No internet connection detected for the device under test.';
   }
 }