diff --git a/automation/System/device_status.yaml b/automation/System/device_status.yaml
index f407a9cb..70322511 100755
--- a/automation/System/device_status.yaml
+++ b/automation/System/device_status.yaml
@@ -6,9 +6,10 @@
   hide_entity: True
   trigger:
        - platform: state
-         entity_id: 
+         entity_id:
            - sensor.wii
-           - sensor.hue_hub
+           - sensor.Hue_Hub_1
+           - sensor.Hue_Hub_2
            - sensor.tablotv
            - sensor.alexa_echo
            - sensor.amazon_dot
@@ -30,15 +31,14 @@
            #- sensor.withings_scale
            - sensor.smart_water_meter
            - sensor.sleep_number_bed
-           
+
   action:
     - service: script.ifttt_notify
       data_template:
         value1: 'Device Status:'
         value2: "{{ trigger.entity_id.split('.')[1]|replace('_', ' ') }} is "
         value3: "{{ trigger.to_state.state }}"
-      
+
     - service: script.Voice_notify
       data_template:
         value1: "{{ trigger.entity_id.split('.')[1]|replace('_', ' ') }} is now {{ trigger.to_state.state }}"
-        
diff --git a/customize/device_tracker.yaml b/customize/device_tracker.yaml
index ca0af5e3..9b9c4c16 100755
--- a/customize/device_tracker.yaml
+++ b/customize/device_tracker.yaml
@@ -59,7 +59,7 @@ device_tracker.large_garage:
   emulated_hue: False
   hidden: True
 
-  
+
 
 device_tracker.small_garage:
   friendly_name: 'Small Garage'
@@ -68,12 +68,16 @@ device_tracker.small_garage:
 
 
 
-device_tracker.hue_hub:
-  friendly_name: 'Hue Hub'
+device_tracker.Hue_Hub_1:
+  friendly_name: 'Hue Hub 1'
   emulated_hue: False
   hidden: True
 
 
+device_tracker.Hue_Hub_2:
+  friendly_name: 'Hue Hub 2'
+  emulated_hue: False
+  hidden: True
 
 device_tracker.led_rgb_garage_large:
   friendly_name: 'Led Rgb Garage Left'
diff --git a/customize/sensors.yaml b/customize/sensors.yaml
index 70c16691..1c7552c5 100755
--- a/customize/sensors.yaml
+++ b/customize/sensors.yaml
@@ -236,12 +236,17 @@ sensor.small_garage_wifi_signal_strength:
   icon: mdi:wifi
 
 
-sensor.hue_hub:
-  friendly_name: 'Hue Hub'
+sensor.hue_hub_1:
+  friendly_name: 'Hue Hub 1'
   emulated_hue: False
   hidden: False
   icon: mdi:router-wireless
 
+sensor.hue_hub_2:
+  friendly_name: 'Hue Hub 2'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:router-wireless
 
 sensor.ipchange:
   friendly_name: 'Ipchange'
diff --git a/group/network.yaml b/group/network.yaml
index a5694b22..a990cfa5 100755
--- a/group/network.yaml
+++ b/group/network.yaml
@@ -7,7 +7,8 @@ Network:
     - sensor.cisco_ap
     - sensor.actiontechap
     - sensor.wii
-    - sensor.hue_hub
+    - sensor.hue_hub_1
+    - sensor.hue_hub_2
     - sensor.tablotv
     - sensor.alexa_echo
     - sensor.amazon_dot
diff --git a/sensor/devices.yaml b/sensor/devices.yaml
index 28103d91..cfdc1834 100755
--- a/sensor/devices.yaml
+++ b/sensor/devices.yaml
@@ -16,9 +16,13 @@
         friendly_name: 'Cisco Main AP'
         value_template: "{{ 'Online' if is_state('device_tracker.cisco_ap', 'home') else 'Offline' }}"
 
-      hue_hub:
-        friendly_name: 'Hue Hub'
-        value_template: "{{ 'Online' if is_state('device_tracker.hue_hub', 'home') else 'Offline' }}"
+      hue_hub_1:
+        friendly_name: 'Hue Hub 1'
+        value_template: "{{ 'Online' if is_state('device_tracker.hue_hub_1', 'home') else 'Offline' }}"
+
+      hue_hub_2:
+        friendly_name: 'Hue Hub 2'
+        value_template: "{{ 'Online' if is_state('device_tracker.hue_hub_2', 'home') else 'Offline' }}"
 
       alexa_echo:
         friendly_name: 'Alexa Echo'