diff --git a/src/Payum/Silex/PayumProvider.php b/src/Payum/Silex/PayumProvider.php
index 23521dd..402282f 100644
--- a/src/Payum/Silex/PayumProvider.php
+++ b/src/Payum/Silex/PayumProvider.php
@@ -113,15 +113,7 @@ protected function registerService(Application $app)
         }));
 
         $app['payum.gateway_choices'] = $app->share(function ($app) {
-            $choices = array();
-            foreach ($app['payum.gateway_factories'] as $factory) {
-                /** @var $factory GatewayFactoryInterface */
-                $config = $factory->createConfig();
-
-                $choices[$config['payum.factory_name']] = $config['payum.factory_title'];
-            }
-
-            return $choices;
+            return array();
         });
 
         $app['payum.core_gateway_factory_config'] = $app->share(function ($app) {
diff --git a/src/Payum/Silex/PimpleAwareRegistry.php b/src/Payum/Silex/PimpleAwareRegistry.php
index 11b69b5..3958641 100644
--- a/src/Payum/Silex/PimpleAwareRegistry.php
+++ b/src/Payum/Silex/PimpleAwareRegistry.php
@@ -24,6 +24,6 @@ public function setPimple(\Pimple $pimple)
      */
     protected function getService($id)
     {
-        return isset($this->pimple[$id]) ? $this->pimple[$id] : $id;
+        return is_object($id) ? $id : $this->pimple[$id];
     }
 }