diff --git a/app/src/main/java/io/xpipe/app/ext/NetworkTunnelStore.java b/app/src/main/java/io/xpipe/app/ext/NetworkTunnelStore.java
index 3a59ef799..8c555af3a 100644
--- a/app/src/main/java/io/xpipe/app/ext/NetworkTunnelStore.java
+++ b/app/src/main/java/io/xpipe/app/ext/NetworkTunnelStore.java
@@ -27,7 +27,7 @@ public interface NetworkTunnelStore extends DataStore, SelfReferentialStore {
     }
 
     default HostAddress getTunnelHostName() {
-        return null;
+        return HostAddress.empty();
     }
 
     default Optional<DataStoreEntryRef<NetworkTunnelStore>> getUnsupportedParent() {