diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index ce6a24c9..37650814 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -162,7 +162,9 @@ class ReportAdmin extends LeftAndMain {
 			unset($filteredCriteria[$notAParam]);
 		}
 
-		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
+		$formLink = $this->Link() . '/EditForm';
+		if($filteredCriteria) $formLink .= '?' . http_build_query($filteredCriteria);
+		$form->setFormAction($formLink);
 		$form->setTemplate('ReportAdminForm');
 		
 		return $form;