diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3be3fb03..486f4f75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [2.7.1 - 2024-07-xx]
+
+### Fixed
+
+- Allow ExApps management disable and remove actions if default Deploy daemon is not accessible. #314
+- Fixed Deploy daemon avilability check using ping timeout set to 3s. #314
+
## [2.7.0 - 2024-07-01]
### Fixed
diff --git a/lib/DeployActions/DockerActions.php b/lib/DeployActions/DockerActions.php
index 6c7918ee..068a4469 100644
--- a/lib/DeployActions/DockerActions.php
+++ b/lib/DeployActions/DockerActions.php
@@ -418,7 +418,9 @@ public function removeVolume(string $dockerUrl, string $volume): array {
public function ping(string $dockerUrl): bool {
$url = $this->buildApiUrl($dockerUrl, '_ping');
try {
- $response = $this->guzzleClient->get($url);
+ $response = $this->guzzleClient->get($url, [
+ 'timeout' => 3,
+ ]);
if ($response->getStatusCode() === 200) {
return true;
}
diff --git a/src/components/Apps/AppDetails.vue b/src/components/Apps/AppDetails.vue
index ffae9d39..893f2034 100644
--- a/src/components/Apps/AppDetails.vue
+++ b/src/components/Apps/AppDetails.vue
@@ -13,13 +13,13 @@
class="uninstall"
type="button"
:value="t('settings', 'Remove')"
- :disabled="installing || isLoading || !defaultDeployDaemonAccessible"
+ :disabled="installing || isLoading"
@click="remove(app.id, removeData)">
{{ t('settings', 'Remove') }}
{{ disableButtonText }}