diff --git a/.drone.yml b/.drone.yml
index 3704372785..730d830c0b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -94,7 +94,6 @@ steps:
           - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
           - cd ../server
           - ./occ app:enable $APP_NAME
-          - ./occ config:system:set allow_local_remote_servers --value 1
           - cd apps/$APP_NAME
 
           # Run integration tests
diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
index 104936669d..ed0998b37b 100644
--- a/lib/Service/CapabilitiesService.php
+++ b/lib/Service/CapabilitiesService.php
@@ -112,7 +112,7 @@ private function renewCapabilities() {
 		$capabilitiesEndpoint = $remoteHost . '/hosting/capabilities';
 
 		$client = $this->clientService->newClient();
-		$options = ['timeout' => 10];
+		$options = ['timeout' => 10, 'nextcloud' => ['allow_local_address' => true]];
 
 		$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
 
diff --git a/lib/WOPI/DiscoveryManager.php b/lib/WOPI/DiscoveryManager.php
index 814d391744..18af860850 100644
--- a/lib/WOPI/DiscoveryManager.php
+++ b/lib/WOPI/DiscoveryManager.php
@@ -96,7 +96,7 @@ public function fetchFromRemote() {
 		$wopiDiscovery = $remoteHost . '/hosting/discovery';
 
 		$client = $this->clientService->newClient();
-		$options = ['timeout' => 5];
+		$options = ['timeout' => 5, 'nextcloud' => ['allow_local_address' => true]];
 
 		$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';