diff --git a/assets/js/views/Config.vue b/assets/js/views/Config.vue
index 1e953d9e6..6bab9c62d 100644
--- a/assets/js/views/Config.vue
+++ b/assets/js/views/Config.vue
@@ -322,8 +322,8 @@
 						</template>
 					</DeviceCard>
 					<DeviceCard
-						v-if="remote"
-						:title="$t('config.remote.title')"
+						v-if="experimental"
+						:title="`${$t('config.remote.title')} 🧪`"
 						editable
 						:unconfigured="isUnconfigured(remoteTags)"
 						data-testid="remote-access"
diff --git a/cmd/root.go b/cmd/root.go
index c6b555071..8960eabe4 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -237,10 +237,7 @@ func runRoot(cmd *cobra.Command, args []string) {
 	go socketHub.Run(pipe.NewDropper(ignoreEmpty).Pipe(tee.Attach()), cache)
 
 	// remote access tunnel
-	var remoteAccess *remote.Remote
-	if remoteHost := os.Getenv("EVCC_REMOTE_ACCESS"); remoteHost != "" {
-		remoteAccess = remote.New(remoteHost, httpd.Router(), valueChan)
-	}
+	remoteAccess := remote.New(util.Getenv("EVCC_REMOTE_ACCESS", "api.evcc.cloud"), httpd.Router(), valueChan)
 
 	// signal ui listening
 	valueChan <- util.Param{Key: keys.StartupCompleted, Val: false}
@@ -396,9 +393,7 @@ func runRoot(cmd *cobra.Command, args []string) {
 	}}
 
 	// publish remote access status
-	if remoteAccess != nil {
-		valueChan <- util.Param{Key: keys.Remote, Val: remoteAccess.ConfigStatus()}
-	}
+	valueChan <- util.Param{Key: keys.Remote, Val: remoteAccess.ConfigStatus()}
 
 	// publish system infos
 	valueChan <- util.Param{Key: keys.Version, Val: util.FormattedVersion()}
diff --git a/server/http.go b/server/http.go
index f60f0695f..9c71d21d3 100644
--- a/server/http.go
+++ b/server/http.go
@@ -301,13 +301,10 @@ func (s *HTTPd) RegisterSystemHandler(site *core.Site, pub publisher, cache *uti
 			"deletesponsortoken": {"DELETE", "/sponsortoken", deleteSponsorTokenHandler(pub)},
 			"experimental":       {"POST", "/experimental/{value:[01truefalse]+}", boolHandler(setExperimental(pub), getExperimental)},
 			"optimizer":          {"POST", "/optimizer/{value:[01truefalse]+}", boolHandler(setOptimizer(pub), getOptimizer)},
-		}
-
-		if remoteAccess != nil {
-			routes["remote"] = route{"POST", "/remote/{value:[01truefalse]+}", boolHandler(remoteAccess.Enable, remoteAccess.Enabled)}
-			routes["remoteclients"] = route{"GET", "/remote/clients", remoteClientsHandler(remoteAccess)}
-			routes["createremoteclient"] = route{"POST", "/remote/clients", createRemoteClientHandler(remoteAccess)}
-			routes["deleteremoteclient"] = route{"DELETE", "/remote/clients", deleteRemoteClientHandler(remoteAccess)}
+			"remote":             {"POST", "/remote/{value:[01truefalse]+}", boolHandler(remoteAccess.Enable, remoteAccess.Enabled)},
+			"remoteclients":      {"GET", "/remote/clients", remoteClientsHandler(remoteAccess)},
+			"createremoteclient": {"POST", "/remote/clients", createRemoteClientHandler(remoteAccess)},
+			"deleteremoteclient": {"DELETE", "/remote/clients", deleteRemoteClientHandler(remoteAccess)},
 		}
 
 		// yaml handlers