diff --git a/guix-data-service/web/repository/controller.scm b/guix-data-service/web/repository/controller.scm
index 101687c..ceb7b0c 100644
--- a/guix-data-service/web/repository/controller.scm
+++ b/guix-data-service/web/repository/controller.scm
@@ -188,12 +188,18 @@
                                          (datetime . ,last-datetime))))))
                                 package-versions))))))
          (else
-          (render-html
-           #:sxml (view-branch-package
-                   repository-id
-                   branch-name
-                   package-name
-                   package-versions))))))
+          (if (null? package-versions)
+              (render-html
+               #:sxml (general-not-found
+                       "Package or branch not found"
+                       "")
+               #:code 404)
+              (render-html
+               #:sxml (view-branch-package
+                       repository-id
+                       branch-name
+                       package-name
+                       package-versions)))))))
     (('GET "repository" repository-id "branch" branch-name "package" package-name "derivation-history")
      (render-branch-package-derivation-history request
                                                mime-types