diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
index 1e1c1b1..dee2057 100644
--- a/app/Http/Controllers/SystemController.php
+++ b/app/Http/Controllers/SystemController.php
@@ -799,11 +799,14 @@ class SystemController extends Controller
 
 		$zo = Zone::findOrFail($validate['zone_id']);
 
+		/*
+		// @todo Disabling this, it needs improvement. If the new node is the ZC it becomes the default for the zone (and therefore remove all defaults from other addresses in the same zone), otherwise default should be false
 		// If this session is for the ZC, it now becomes the default.
 		if ($o->match($zo,Address::NODE_ZC)->count()) {
 			SystemZone::where('default',TRUE)->update(['default'=>FALSE]);
 			$validate['default'] = TRUE;
 		}
+		*/
 
 		$o->sessions()->attach($zo,$validate);