diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index dd3cb30027..0860dfd67c 100644
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -51,21 +51,10 @@ class Receive extends BaseModule
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 		}
 
-		$args = DI::args();
-
-		$type = $args->get(1);
-
-		switch ($type) {
-			case 'public':
-				self::receivePublic();
-				break;
-			case 'users':
-				self::receiveUser($args->get(2));
-				break;
-			default:
-				self::$logger->info('Wrong call.');
-				throw new HTTPException\BadRequestException('wrong call.');
-				break;
+		if ($parameters['type'] === 'public') {
+			self::receivePublic();
+		} else if ($parameters['type'] === 'users') {
+			self::receiveUser($parameters['guid']);
 		}
 	}
 
diff --git a/static/routes.config.php b/static/routes.config.php
index 85bd4f9414..24fa016179 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -409,8 +409,8 @@ return [
 	],
 
 	'/receive' => [
-		'/public'       => [Module\Diaspora\Receive::class, [R::POST]],
-		'/users/{guid}' => [Module\Diaspora\Receive::class, [R::POST]],
+		'/{type:public}'       => [Module\Diaspora\Receive::class, [        R::POST]],
+		'/{type:users}/{guid}' => [Module\Diaspora\Receive::class, [        R::POST]],
 	],
 
 	'/settings' => [