diff --git a/lib/private/integritycheck/checker.php b/lib/private/integritycheck/checker.php
index e6f9f9a145..8ede6216b7 100644
--- a/lib/private/integritycheck/checker.php
+++ b/lib/private/integritycheck/checker.php
@@ -87,8 +87,6 @@ class Checker {
 	 * @return bool
 	 */
 	public function isCodeCheckEnforced() {
-		// FIXME: Once the signing server is instructed to sign daily, beta and
-		// RCs as well these need to be included also.
 		$signedChannels = [
 			'daily',
 			'testing',
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 26194bb118..cfdfa5021b 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -271,6 +271,10 @@ class CheckSetupController extends Controller {
 	 * @return DataResponse
 	 */
 	public function getFailedIntegrityCheckFiles() {
+		if(!$this->checker->isCodeCheckEnforced()) {
+			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+		}
+
 		$completeResults = $this->checker->getResults();
 
 		if(!empty($completeResults)) {
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php
index c22ddb2e12..3ce7c64b4a 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/settings/controller/CheckSetupControllerTest.php
@@ -618,7 +618,22 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->checkSetupController->rescanFailedIntegrityCheck());
 	}
 
+	public function testGetFailedIntegrityCheckDisabled() {
+		$this->checker
+			->expects($this->once())
+			->method('isCodeCheckEnforced')
+			->willReturn(false);
+
+		$expected = new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+		$this->assertEquals($expected, $this->checkSetupController->getFailedIntegrityCheckFiles());
+	}
+
+
 	public function testGetFailedIntegrityCheckFilesWithNoErrorsFound() {
+		$this->checker
+			->expects($this->once())
+			->method('isCodeCheckEnforced')
+			->willReturn(true);
 		$this->checker
 			->expects($this->once())
 			->method('getResults')
@@ -635,6 +650,10 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testGetFailedIntegrityCheckFilesWithSomeErrorsFound() {
+		$this->checker
+			->expects($this->once())
+			->method('isCodeCheckEnforced')
+			->willReturn(true);
 		$this->checker
 				->expects($this->once())
 				->method('getResults')