diff --git a/newscoop/public/index.php b/newscoop/public/index.php
index 8293602d2f..c3dfb4622c 100644
--- a/newscoop/public/index.php
+++ b/newscoop/public/index.php
@@ -66,6 +66,7 @@
 
 $kernel->loadClassCache();
 $request = Request::createFromGlobals();
+Request::setTrustedProxies(array($request->server->get('REMOTE_ADDR')));
 $response = $kernel->handle($request);
 $response->send();
 $kernel->terminate($request, $response);
diff --git a/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php b/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php
index f2293e103d..f43d578886 100644
--- a/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php
+++ b/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php
@@ -44,6 +44,11 @@ public function indexAction(Request $request)
         $application = \Zend_Registry::get('zend_application');
         $bootstrap = $application->getBootstrap();
 
+        // set https on when it's ssl
+        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
+            $_SERVER['HTTPS'] = 'on';
+        }
+
         $front = $bootstrap->getResource('FrontController');
         $front->setDefaultControllerName('legacy');
         $front->returnResponse(true);