diff --git a/xplat/Flipper/FlipperCertificateProvider.h b/xplat/Flipper/FlipperCertificateProvider.h
index 4b41c88e2..7ff01d424 100644
--- a/xplat/Flipper/FlipperCertificateProvider.h
+++ b/xplat/Flipper/FlipperCertificateProvider.h
@@ -10,6 +10,8 @@
 #include <functional>
 #include <string>
 #include "FlipperCertificateExchangeMedium.h"
+#include "FlipperState.h"
+#include "FlipperStep.h"
 namespace facebook {
 namespace flipper {
 
@@ -44,6 +46,12 @@ class FlipperCertificateProvider {
    * `stop` is called.
    */
   virtual bool shouldResetCertificateFolder() = 0;
+
+  /**
+   * Sets the FlipperState, so that Cert Provider can send debuggin information
+   * to troubleshoot screen.
+   */
+  virtual void setFlipperState(std::shared_ptr<FlipperState> state) = 0;
 };
 
 } // namespace flipper
diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
index a3fd84655..83fb2631a 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
@@ -379,6 +379,7 @@ void FlipperConnectionManagerImpl::requestSignedCertFromFlipper() {
                 contextStore_->storeConnectionConfig(config);
               }
               if (certProvider_) {
+                certProvider_->setFlipperState(flipperState_);
                 auto gettingCertFromProvider =
                     flipperState_->start("Getting cert from Cert Provider");