diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
index 7c74d8fca..8458a458b 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
@@ -91,6 +91,12 @@ FlipperConnectionManagerImpl::~FlipperConnectionManagerImpl() {
 }
 
 void FlipperConnectionManagerImpl::start() {
+  if (isStarted_) {
+    log("Already started");
+    return;
+  }
+  isStarted_ = true;
+
   auto step = flipperState_->start("Start connection thread");
 
   folly::makeFuture()
@@ -103,6 +109,10 @@ void FlipperConnectionManagerImpl::start() {
 }
 
 void FlipperConnectionManagerImpl::startSync() {
+  if (!isStarted_) {
+    log("Not started");
+    return;
+  }
   if (!isRunningInOwnThread()) {
     log(WRONG_THREAD_EXIT_MSG);
     return;
@@ -219,6 +229,10 @@ void FlipperConnectionManagerImpl::connectSecurely() {
 }
 
 void FlipperConnectionManagerImpl::reconnect() {
+  if (!isStarted_) {
+    log("Not started");
+    return;
+  }
   folly::makeFuture()
       .via(flipperEventBase_->getEventBase())
       .delayed(std::chrono::seconds(reconnectIntervalSeconds))
@@ -226,6 +240,12 @@ void FlipperConnectionManagerImpl::reconnect() {
 }
 
 void FlipperConnectionManagerImpl::stop() {
+  if (!isStarted_) {
+    log("Not started");
+    return;
+  }
+  isStarted_ = false;
+
   if (client_) {
     client_->disconnect();
   }
diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h
index 3989e7684..9763748ce 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.h
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.h
@@ -53,6 +53,7 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager {
 
  private:
   bool isOpen_ = false;
+  bool isStarted_ = false;
   Callbacks* callbacks_;
   DeviceData deviceData_;
   std::shared_ptr<FlipperState> flipperState_;