diff --git a/changelog.md b/changelog.md
index d90df285..0a2c912b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+## Version 0.21.4
+ - Remove tunnel check when Constellation is off 
+
 ## Version 0.21.3
  - fix Bug with table width
  - Add move to top/bottom
diff --git a/package.json b/package.json
index 42ead6c7..b65c1f2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.21.3",
+  "version": "0.21.4",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/constellation/nebula.go b/src/constellation/nebula.go
index 6fd03a76..54fc3f08 100644
--- a/src/constellation/nebula.go
+++ b/src/constellation/nebula.go
@@ -268,6 +268,7 @@ func ResetNebula() error {
 	stop()
 	utils.Log("Resetting nebula...")
 	os.RemoveAll(utils.CONFIGFOLDER + "nebula.yml")
+	os.RemoveAll(utils.CONFIGFOLDER + "nebula-temp.yml")
 	os.RemoveAll(utils.CONFIGFOLDER + "ca.crt")
 	os.RemoveAll(utils.CONFIGFOLDER + "ca.key")
 	os.RemoveAll(utils.CONFIGFOLDER + "cosmos.crt")
@@ -1060,6 +1061,7 @@ func pingLighthouse(lh utils.ConstellationDevice, retries int) {
 func GetCurrentDeviceName() (string, error) {
 	config := utils.GetMainConfig()
 	name := config.ConstellationConfig.ThisDeviceName
+
 	if name == "" {
 		nebulaFile, err := ioutil.ReadFile(utils.CONFIGFOLDER + "nebula.yml")
 		if err != nil {
diff --git a/src/constellation/tunnels.go b/src/constellation/tunnels.go
index 6bdb41b7..546c5f8e 100644
--- a/src/constellation/tunnels.go
+++ b/src/constellation/tunnels.go
@@ -316,6 +316,10 @@ func UpdateLocalTunnelCache() {
 }
 
 func GetLocalTunnelCache() []utils.ConstellationTunnel {
+	if !utils.GetMainConfig().ConstellationConfig.Enabled {
+		return []utils.ConstellationTunnel{}
+	}
+	
 	isLB, err := GetCurrentDeviceIsLoadbalancer()
 	if err != nil {
 		utils.Debug("[constellation] Failed to get current device load balancer status for tunnel cache retrieval " + err.Error())