diff --git a/ext/view/main.php b/ext/view/main.php
index e7e26091..ef872288 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -133,7 +133,12 @@ class ViewImage extends Extension {
 			send_event(new ImageInfoSetEvent(Image::by_id($image_id)));
 
 			$page->set_mode("redirect");
-			$page->set_redirect(make_link("post/view/$image_id", url_escape($_POST['query'])));
+			if(isset($_POST['query'])) {
+				$page->set_redirect(make_link("post/view/$image_id", url_escape($_POST['query'])));
+			}
+			else {
+				$page->set_redirect(make_link("post/view/$image_id"));
+			}
 		}
 	}