diff --git a/src/ZigBeeNet/ZigBeeNode.cs b/src/ZigBeeNet/ZigBeeNode.cs
index c7fc4c4b..d265e300 100644
--- a/src/ZigBeeNet/ZigBeeNode.cs
+++ b/src/ZigBeeNet/ZigBeeNode.cs
@@ -276,7 +276,7 @@ private void SetBindingTable(List<BindingTable> bindingTable)
         ///
         /// <returns><see cref="Future"> returning a <see cref="Boolean"></returns>
         /// </summary>
-        public async Task<bool> UpdateBindingTable()
+        public async Task<ZigBeeStatus> UpdateBindingTable()
         {
             byte index = 0;
             int tableSize = 0;
@@ -290,9 +290,9 @@ public async Task<bool> UpdateBindingTable()
 
                 CommandResult result = await _network.SendTransaction(bindingRequest, new ManagementBindRequest());
 
-                if (result.IsError())
+                if (result.IsTimeout())
                 {
-                    return false;
+                    return ZigBeeStatus.FAILURE;
                 }
 
                 ManagementBindResponse response = (ManagementBindResponse)result.GetResponse();
@@ -305,7 +305,7 @@ public async Task<bool> UpdateBindingTable()
             } while (index < tableSize);
 
             SetBindingTable(bindingTable);
-            return true;
+            return ZigBeeStatus.SUCCESS;
         }
 
         /// <summary>