diff --git a/include/api.php b/include/api.php
index 09184dcf91..87ce982b09 100644
--- a/include/api.php
+++ b/include/api.php
@@ -386,7 +386,7 @@ function api_call(App $a, App\Arguments $args = null)
 		}
 
 		Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]);
-		throw new NotImplementedException();
+		throw new NotFoundException();
 	} catch (HTTPException $e) {
 		header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
 		return api_error($type, $e, $args);
diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 9f7aff7a00..4fd6855f21 100644
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -500,7 +500,7 @@ class ApiTest extends FixtureTest
 	public function testApiCallWithUninplementedApi()
 	{
 		self::assertEquals(
-			'{"status":{"error":"Not Implemented","code":"501 Not Implemented","request":""}}',
+			'{"status":{"error":"Not Found","code":"404 Not Found","request":""}}',
 			api_call($this->app)
 		);
 	}