diff --git a/Demos/api/Orchestration/CMakeLists.txt b/Demos/api/Orchestration/CMakeLists.txt
index 3250bff88..8679858b8 100644
--- a/Demos/api/Orchestration/CMakeLists.txt
+++ b/Demos/api/Orchestration/CMakeLists.txt
@@ -6,4 +6,5 @@ make_silkit_demo(SilKitDemoAutonomous Autonomous.cpp OFF)
 make_silkit_demo(SilKitDemoCoordinated Coordinated.cpp OFF)
 make_silkit_demo(SilKitDemoSimStep SimStep.cpp OFF)
 make_silkit_demo(SilKitDemoSimStepAsync SimStepAsync.cpp OFF)
+make_silkit_demo(SilKitDemoShutdown Shutdown.cpp OFF)
 
diff --git a/Demos/api/Orchestration/Shutdown.cpp b/Demos/api/Orchestration/Shutdown.cpp
new file mode 100644
index 000000000..80bb3051b
--- /dev/null
+++ b/Demos/api/Orchestration/Shutdown.cpp
@@ -0,0 +1,148 @@
+// SPDX-FileCopyrightText: 2024 Vector Informatik GmbH
+//
+// SPDX-License-Identifier: MIT
+
+#include <iostream>
+#include <thread>
+#include <atomic>
+#include <future>
+#include <chrono>
+#include <memory>
+#include <functional>
+
+#include "silkit/SilKit.hpp"
+#include "silkit/services/orchestration/string_utils.hpp"
+#include "silkit/experimental/participant/ParticipantExtensions.hpp"
+
+using namespace std::chrono_literals;
+using namespace SilKit::Services::Orchestration;
+
+std::unique_ptr<std::thread> timeoutThread;
+std::atomic_bool timerActive{false};
+std::atomic_bool stopRequested{false};
+std::atomic_bool participantIsOperational{true};
+std::unique_ptr<SilKit::IParticipant> participant;
+
+void OnTimerTimeout()
+{
+    std::cout << "Timeout reached, destroying participant (nongraceful)." << std::endl;
+    timerActive = false;
+    if (participant)
+    {
+        participantIsOperational = false;
+        participant.reset();
+    }
+}
+
+void StartForceStopTimer(std::chrono::seconds timeout)
+{
+    timerActive = true;
+    timeoutThread = std::make_unique<std::thread>([timeout]() {
+        for (auto remaining = timeout.count(); remaining > 0; --remaining)
+        {
+            if (!timerActive)
+                return;
+            std::cout << "Nongraceful stop in " << remaining << " seconds..." << std::endl;
+            std::this_thread::sleep_for(1s);
+        }
+        if (timerActive)
+        {
+            OnTimerTimeout();
+        }
+    });
+}
+
+
+void TryStop(ILifecycleService* lifecycleService)
+{
+    if (stopRequested)
+    {
+        return;
+    }
+
+    stopRequested = true;
+
+    auto state = lifecycleService->State();
+
+    if (state == ParticipantState::Running || state == ParticipantState::Paused)
+    {
+        lifecycleService->Stop("Stop while running/paused."); // graceful
+    }
+    else
+    {
+        StartForceStopTimer(std::chrono::seconds{5});
+    }
+}
+
+int main(int argc, char** argv)
+{
+    int rc = 0;
+
+    if (argc != 2)
+    {
+        std::cerr << "Wrong number of arguments! Start demo with: " << argv[0] << " <ParticipantName>" << std::endl;
+        return -1;
+    }
+    std::string participantName(argv[1]);
+
+    try
+    {
+        // Setup participant, lifecycle and logging.
+        const std::string registryUri = "silkit://localhost:8500";
+        const std::string configString = R"({"Logging":{"Sinks":[{"Type":"Stdout","Level":"Info"}]}})";
+        auto participantConfiguration = SilKit::Config::ParticipantConfigurationFromString(configString);
+
+        participant = SilKit::CreateParticipant(participantConfiguration, participantName, registryUri);
+        auto logger = participant->GetLogger();
+
+        // Create a coordinated lifecycle
+        auto* lifecycleService =
+            participant->CreateLifecycleService({SilKit::Services::Orchestration::OperationMode::Coordinated});
+
+		// Wait for the "Running" state on this participant and handle the requested stop
+        auto* systemMonitor = participant->CreateSystemMonitor();
+        systemMonitor->AddParticipantStatusHandler(
+            [lifecycleService, participantName, logger](const ParticipantStatus& status) {
+
+            if (participantName != status.participantName)
+                return;
+
+            std::stringstream ss;
+            ss << "Participant state: " << status.state;
+            logger->Info(ss.str());
+
+            if (status.state == ParticipantState::ServicesCreated)
+            {
+                logger->Info("TryStop in ServicesCreated");
+                TryStop(lifecycleService);
+            }
+
+            if (stopRequested && (status.state == ParticipantState::Running || status.state == ParticipantState::Paused))
+            {
+                lifecycleService->Stop("Requested stop."); // Graceful
+            }
+        });
+
+        lifecycleService->SetShutdownHandler([]() { 
+            // Cancel ForceStopTimer timer if shutdown happened already
+            timerActive = false; 
+            });
+
+        auto finalStateFuture = lifecycleService->StartLifecycle();
+        finalStateFuture.get();
+
+    }
+    catch (const std::exception& error)
+    {
+        std::cerr << "Something went wrong: " << error.what() << std::endl;
+        rc = -2;
+    }
+
+    // Clean up the timeout thread.
+    if (timeoutThread && timeoutThread->joinable())
+    {
+        timeoutThread->join();
+    }
+
+    return rc;
+}