Fix: Ensure Subscribe Waits for Register Completion or Timeout

Fix: Ensure Subscribe Waits for Register Completion or Timeout #5017