diff --git a/network/wifi.go b/network/wifi.go
index 4bec1648..37eaec2b 100644
--- a/network/wifi.go
+++ b/network/wifi.go
@@ -25,24 +25,30 @@ func Dot11Freq2Chan(freq int) int {
 		return ((freq - 5035) / 5) + 7
 	} else if freq >= 5875 && freq <= 5895 {
 		return 177
-	} else if freq >= 5955 && freq <= 7115 {
+	} else if freq >= 5955 && freq <= 7115 { // 6GHz 
                 return ((freq - 5955) / 5) + 1
 	}
 	return 0
 }
-
 func Dot11Chan2Freq(channel int) int {
-	if channel <= 13 {
-		return ((channel - 1) * 5) + 2412
-	} else if channel == 14 {
-		return 2484
-	} else if channel <= 173 {
-		return ((channel - 7) * 5) + 5035
-	} else if channel == 177 {
-		return 5885
-	}
-
-	return 0
+        if channel <= 13 {
+                return ((channel - 1) * 5) + 2412
+        } else if channel == 14 {
+                return 2484
+        } else if channel == 36 || channel == 40 || channel == 44 || channel == 48 || 
+                  channel == 52 || channel == 56 || channel == 60 || channel == 64 || 
+                  channel == 68 || channel == 72 || channel == 60 || channel == 64 || 
+                  channel == 100 || channel == 104 || channel == 108 || channel == 112 || 
+                  channel == 116 || channel == 120 || channel == 124 || channel == 128 || 
+                  channel == 132 || channel == 136 || channel == 140 || channel == 144 || 
+                  channel == 149 || channel == 153 || channel == 157 || channel == 161 || 
+                  channel == 165 || channel == 169 || channel == 173 || channel == 177 { 
+                return ((channel - 7) * 5) + 5035
+// 6GHz - Skipped 1-13 to avoid 2Ghz channels conflict  
+        } else if channel >= 17 && channel <= 253 { 
+                return ((channel - 1) * 5) + 5955
+        }
+        return 0
 }
 
 type APNewCallback func(ap *AccessPoint)