diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 88504225f..bedcd44d7 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -114,8 +114,10 @@ class Request extends Zend_Controller_Request_Http
     public function protectId($id)
     {
         if (! isset($this->uniqueId)) {
-            $this->uniqueId = Window::generateId();
+            $windowId = $this->getHeader('X-Icinga-WindowId');
+            $this->uniqueId = empty($windowId) ? Window::generateId() : $windowId;
         }
+
         return $id . '-' . $this->uniqueId;
     }
 }