diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index 562639404a..81e07b44e6 100644
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -80,10 +80,10 @@ TUPLE: annotation < entity parent ;
 : lookup-annotation ( id -- annotation )
     [ f ] dip <annotation> select-tuple ;
 
-: paste ( id -- paste )
-    [ <paste-state> select-tuple ]
-    [ f <annotation> select-tuples ]
-    bi >>annotations ;
+: paste ( id -- paste/f )
+    [ <paste-state> select-tuple ] keep over [
+        f <annotation> select-tuples >>annotations
+    ] [ drop ] if ;
 
 ! ! !
 ! LINKS, ETC