diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml
index e2d53784c2..0dc0829d9e 100644
--- a/phpBB/config/default/container/services_content.yml
+++ b/phpBB/config/default/container/services_content.yml
@@ -73,7 +73,6 @@ services:
         arguments:
             - '@cache.driver'
             - '@config'
-            - '@request'
 
     viewonline_helper:
         class: phpbb\viewonline_helper
diff --git a/phpBB/phpbb/lock/posting.php b/phpBB/phpbb/lock/posting.php
index d912475890..1fee36e63f 100644
--- a/phpBB/phpbb/lock/posting.php
+++ b/phpBB/phpbb/lock/posting.php
@@ -15,7 +15,6 @@ namespace phpbb\lock;
 
 use phpbb\cache\driver\driver_interface as cache_interface;
 use phpbb\config\config;
-use phpbb\request\request_interface;
 
 class posting
 {
@@ -25,58 +24,72 @@ class posting
 	/** @var config */
 	private $config;
 
-	/** @var request_interface */
-	private $request;
-
 	/** @var string */
 	private $lock_name = '';
 
+	/** @var bool Lock state */
+	private $locked = false;
+
 	/**
 	 * Constructor for posting lock
 	 *
 	 * @param cache_interface $cache
 	 * @param config $config
-	 * @param request_interface $request
 	 */
-	public function __construct(cache_interface $cache, config $config, request_interface $request)
+	public function __construct(cache_interface $cache, config $config)
 	{
 		$this->cache = $cache;
 		$this->config = $config;
-		$this->request = $request;
 	}
 
 	/**
-	 * Get lock name
-	 * @return string Lock name
+	 * Set lock name
+	 *
+	 * @param int $creation_time Creation time of form, must be checked already
+	 * @param string $form_token Form token used for form, must be checked already
+	 *
+	 * @return void
 	 */
-	private function lock_name(): string
+	private function set_lock_name(int $creation_time, string $form_token): void
 	{
-		if ($this->lock_name)
-		{
-			return $this->lock_name;
-		}
-
-		$creation_time	= abs($this->request->variable('creation_time', 0));
-		$token = $this->request->variable('form_token', '');
-
-		return sha1(((string) $creation_time) . $token) . '_posting_lock';
+		$this->lock_name = sha1(((string) $creation_time) . $form_token) . '_posting_lock';
 	}
 
 	/**
 	 * Acquire lock for current posting form submission
 	 *
+	 * @param int $creation_time Creation time of form, must be checked already
+	 * @param string $form_token Form token used for form, must be checked already
+	 *
 	 * @return bool True if lock could be acquired, false if not
 	 */
-	public function acquire(): bool
+	public function acquire(int $creation_time, string $form_token): bool
 	{
+		$this->set_lock_name($creation_time, $form_token);
+
 		// Lock is held for session, cannot acquire it
-		if ($this->cache->_exists($this->lock_name()))
+		if ($this->cache->_exists($this->lock_name))
 		{
 			return false;
 		}
 
-		$this->cache->put($this->lock_name(), true, $this->config['flood_interval']);
+		$this->locked = true;
+
+		$this->cache->put($this->lock_name, true, $this->config['flood_interval']);
 
 		return true;
 	}
-}
\ No newline at end of file
+
+	/**
+	 * Release lock
+	 *
+	 * @return void
+	 */
+	public function release(): void
+	{
+		if ($this->locked)
+		{
+			$this->cache->destroy($this->lock_name);
+		}
+	}
+}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 7b3d2243ab..bea75081c1 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1432,7 +1432,11 @@ if ($submit || $preview || $refresh)
 		/** @var \phpbb\lock\posting $posting_lock */
 		$posting_lock = $phpbb_container->get('posting.lock');
 
-		if ($posting_lock->acquire())
+		// Get creation time and form token, must be already checked at this point
+		$creation_time	= abs($request->variable('creation_time', 0));
+		$form_token = $request->variable('form_token', '');
+
+		if ($posting_lock->acquire($creation_time, $form_token))
 		{
 			// Lock/Unlock Topic
 			$change_topic_status = $post_data['topic_status'];
@@ -1561,6 +1565,9 @@ if ($submit || $preview || $refresh)
 			// The last parameter tells submit_post if search indexer has to be run
 			$redirect_url = submit_post($mode, $post_data['post_subject'], $post_author_name, $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
 
+			// Release lock after submitting post
+			$posting_lock->release();
+
 			/**
 			* This event allows you to define errors after the post action is performed
 			*