diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1d37e7f8e..989f3bee7 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1044,6 +1044,11 @@ sub cgiurl (@) {
 		$cgiurl=$params{cgiurl};
 		delete $params{cgiurl};
 	}
+
+	unless (%params) {
+		return $cgiurl;
+	}
+
 	return $cgiurl."?".
 		join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }