diff --git a/appinfo/routes.php b/appinfo/routes.php
index 4b632a268..f7a6f0576 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -78,10 +78,10 @@ return [
 
 		// api
 		['name' => 'board_api#index', 'url' => '/api/v1.0/boards', 'verb' => 'GET'],
-		['name' => 'board_api#get', 'url' => '/api/v1.0/board/{id}', 'verb' => 'GET'],
-		['name' => 'board_api#create', 'url' => '/api/v1.0/board', 'verb' => 'POST'],
-		['name' => 'board_api#delete', 'url' => '/api/v1.0/board/{id}', 'verb' => 'DELETE'],
-		['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/board/{id}/undo_delete', 'verb' => 'POST'],
+		['name' => 'board_api#get', 'url' => '/api/v1.0/boards/{id}', 'verb' => 'GET'],
+		['name' => 'board_api#create', 'url' => '/api/v1.0/boards', 'verb' => 'POST'],
+		['name' => 'board_api#delete', 'url' => '/api/v1.0/boards/{id}', 'verb' => 'DELETE'],
+		['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/boards/{id}/undo_delete', 'verb' => 'POST'],
 
 		['name' => 'stack_api#index', 'url' => '/api/v1.0/board/{boardId}/stacks', 'verb' => 'GET'],
 		['name' => 'stack_api#create', 'url' => '/api/v1.0/board/{boardId}/stacks', 'verb' => 'POST'],
diff --git a/lib/Controller/BoardApiController.php b/lib/Controller/BoardApiController.php
index 312590541..c2d2813f7 100644
--- a/lib/Controller/BoardApiController.php
+++ b/lib/Controller/BoardApiController.php
@@ -24,6 +24,7 @@
 namespace OCA\Deck\Controller;
 
 use OCP\AppFramework\ApiController;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 use OCP\IUserManager;
@@ -74,10 +75,14 @@ class BoardApiController extends ApiController {
 	 *
 	 * Return the board specified by $id.
 	 */
-	public function get($id) {
+	public function get($id) {		
 		$board = $this->service->find($id);
+		
+		if ($board === false || $board === null) {
+			return new DataResponse('Board not found', HTTP::STATUS_NOT_FOUND);
+		}
 
-		return new DataResponse($board);
+		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
 	/**