diff --git a/module/Rest/src/Action/GetVisitsAction.php b/module/Rest/src/Action/GetVisitsAction.php
index bd78adbb..7a911789 100644
--- a/module/Rest/src/Action/GetVisitsAction.php
+++ b/module/Rest/src/Action/GetVisitsAction.php
@@ -25,7 +25,7 @@ class GetVisitsAction extends AbstractRestAction
 
     /**
      * GetVisitsAction constructor.
-     * @param VisitsTrackerInterface|VisitsTracker $visitsTracker
+     * @param VisitsTrackerInterface $visitsTracker
      * @param TranslatorInterface $translator
      *
      * @Inject({VisitsTracker::class, "translator"})
@@ -59,8 +59,11 @@ class GetVisitsAction extends AbstractRestAction
         } catch (InvalidArgumentException $e) {
             return new JsonResponse([
                 'error' => RestUtils::getRestErrorCodeFromException($e),
-                'message' => sprintf($this->translator->translate('Provided short code "%s" is invalid'), $shortCode),
-            ], 400);
+                'message' => sprintf(
+                    $this->translator->translate('Provided short code "%s" does not exist'),
+                    $shortCode
+                ),
+            ], 404);
         } catch (\Exception $e) {
             return new JsonResponse([
                 'error' => RestUtils::UNKNOWN_ERROR,
diff --git a/module/Rest/src/Action/ResolveUrlAction.php b/module/Rest/src/Action/ResolveUrlAction.php
index c1783834..ac703b38 100644
--- a/module/Rest/src/Action/ResolveUrlAction.php
+++ b/module/Rest/src/Action/ResolveUrlAction.php
@@ -50,8 +50,8 @@ class ResolveUrlAction extends AbstractRestAction
             if (! isset($longUrl)) {
                 return new JsonResponse([
                     'error' => RestUtils::INVALID_ARGUMENT_ERROR,
-                    'message' => sprintf($this->translator->translate('No URL found for shortcode "%s"'), $shortCode),
-                ], 400);
+                    'message' => sprintf($this->translator->translate('No URL found for short code "%s"'), $shortCode),
+                ], 404);
             }
 
             return new JsonResponse([