diff --git a/src/HAP.cpp b/src/HAP.cpp
index 69720de..2c0ab49 100644
--- a/src/HAP.cpp
+++ b/src/HAP.cpp
@@ -1413,7 +1413,11 @@ tagError HAPClient::addController(uint8_t *id, uint8_t *ltpk, boolean admin){
       charPrintRow(id,hap_controller_IDBYTES,2);
       LOG2(admin?" (admin)\n\n":" (regular)\n\n");
       saveControllers();
-    } else {
+      if (homeSpan.pairCallback) {
+        homeSpan.pairCallback(true);
+      }
+    }
+    else {
       LOG0("\n*** ERROR: Can't pair more than %d Controllers\n\n",MAX_CONTROLLERS);
       err=tagError_MaxPeers;
     }    
@@ -1462,6 +1466,9 @@ void HAPClient::removeController(uint8_t *id){
     if(homeSpan.pairCallback)                                    // if set, invoke user-defined Pairing Callback to indicate device has been un-paired
       homeSpan.pairCallback(false);    
   }
+  else if(homeSpan.pairCallback){                    // if set, invoke user-defined Pairing Callback to indicate device has been un-paired
+      homeSpan.pairCallback(false);
+  }
 
   saveControllers();
 }