diff --git a/amazon_store.module b/amazon_store.module
index 12b0725..7ef838b 100644
--- a/amazon_store.module
+++ b/amazon_store.module
@@ -546,6 +546,7 @@ function _amazon_store_page() {
 
   $output = "";
   $parameters = array();
+  $do_search = FALSE;
 
   // Grab the URL args that we'll allow and put them in as parameters for Amazon search
   extract($_GET, EXTR_PREFIX_ALL, "get");
@@ -592,6 +593,7 @@ function _amazon_store_page() {
     $getarg = "get_$entity";
     if (!empty($$getarg) && amazon_store_allowed_parameter($parameters['SearchIndex'], $entity)) {
       $parameters[$entity] = $$getarg;
+      $do_search = TRUE;
     }
   }
 
@@ -618,7 +620,7 @@ function _amazon_store_page() {
     }
   }
 
-  if (!empty($parameters['ItemId'])) {
+  if (!empty($parameters['ItemId']) && $do_search == FALSE) {
     $results = _amazon_store_itemlist(array('ItemId' => $parameters['ItemId']));
   }
   else {