diff --git a/Command/SearchCommand.php b/Command/SearchCommand.php
index 0c0e951..30712ce 100644
--- a/Command/SearchCommand.php
+++ b/Command/SearchCommand.php
@@ -40,7 +40,8 @@ class SearchCommand extends ContainerAwareCommand
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $index = $this->getContainer()->get('foq_elastica.index_manager')->getIndex($input->getOption('index'));
+        $indexName = $input->getOption('index');
+        $index = $this->getContainer()->get('foq_elastica.index_manager')->getIndex($indexName ? $indexName : null);
         $type  = $index->getType($input->getArgument('type'));
         $query = Elastica_Query::create($input->getArgument('query'));
         $query->setLimit($input->getOption('limit'));
diff --git a/IndexManager.php b/IndexManager.php
index 3891088..b117847 100644
--- a/IndexManager.php
+++ b/IndexManager.php
@@ -13,10 +13,10 @@ class IndexManager
      * @param array  $indexesByName
      * @param string $defaultIndexName
      */
-    public function __construct(array $indexesByName, $defaultIndexName)
+    public function __construct(array $indexesByName, $defaultIndex)
     {
         $this->indexesByName = $indexesByName;
-        $this->defaultIndexName = $defaultIndexName;
+        $this->defaultIndexName = $defaultIndex->getName();
     }
 
     /**