diff --git a/tunnel_manager.go b/tunnel_manager.go
index 4ac6a6b..6a57285 100644
--- a/tunnel_manager.go
+++ b/tunnel_manager.go
@@ -76,11 +76,16 @@ func (m *TunnelManager) RequestCreateTunnel(tunReq Tunnel) (Tunnel, error) {
 		if err != nil {
 			return Tunnel{}, err
 		}
-	} else {
-		for _, tun := range m.db.GetTunnels() {
-			if tunReq.TunnelPort == tun.TunnelPort {
-				return Tunnel{}, errors.New("Tunnel port already in use")
-			}
+	}
+
+	for _, tun := range m.db.GetTunnels() {
+		fmt.Println(tunReq.Domain, tun.Domain)
+		if tunReq.Domain == tun.Domain {
+			return Tunnel{}, errors.New("Tunnel domain already in use")
+		}
+
+		if tunReq.TunnelPort == tun.TunnelPort {
+			return Tunnel{}, errors.New("Tunnel port already in use")
 		}
 	}