diff --git a/acquia_search/acquia_search.module b/acquia_search/acquia_search.module
index 4d8a415..0fdcfd7 100644
--- a/acquia_search/acquia_search.module
+++ b/acquia_search/acquia_search.module
@@ -86,9 +86,18 @@ function acquia_search_enable_acquia_solr_environment() {
   if (!$environment) {
     // Only set the default if we just created the environment.
     // This will almost always happen, unless the module was disabled via SQL.
-    apachesolr_default_environment(ACQUIA_SEARCH_ENVIRONMENT_ID);
+    variable_set('apachesolr_default_environment', ACQUIA_SEARCH_ENVIRONMENT_ID);
     $environment['conf'] = array();
   }
+  // Also make sure that the default search page has Acquia Search as its
+  // default environment
+  $default_search_page_id = apachesolr_search_default_search_page();
+  $default_search_page = apachesolr_search_page_load($default_search_page_id);
+  if (!empty($default_search_page) && ($default_search_page['env_id'] != ACQUIA_SEARCH_ENVIRONMENT_ID)) {
+    $default_search_page['env_id'] = ACQUIA_SEARCH_ENVIRONMENT_ID;
+    apachesolr_search_page_save($default_search_page);
+  }
+
   $acquia_environment = acquia_search_get_environment();
   // Override default values
   foreach($acquia_environment as $key => $value) {