diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
new file mode 100644
index 000000000..2951d448d
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable host and service flap detection on an Icinga instance
+ */
+class ToggleFlapDetection extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_FLAP_DETECTION' : 'DISABLE_FLAP_DETECTION';
+    }
+}