diff --git a/code/config/config.php b/code/config/config.php
index a340b33c..e2c8c317 100644
--- a/code/config/config.php
+++ b/code/config/config.php
@@ -33,7 +33,7 @@ protected function _initialize(KObjectConfig $config)
             'cache_path'     => $config->cache_path ? $config->log_path : $config->site_path.'/cache',
             'extension_path' => $config->extension_path ? $config->extension_path : $config->site_path.'/extensions',
             'debug'          => JFactory::getConfig()->get('debug'),
-            'base_path'      => $config->base_path ?? null,
+            'base_path'      => $config->base_path ?? JFactory::getApplication()->getCfg('live_site'),
             'url_prefix'     => $config->url_prefix ? trim($config->url_prefix, '/') : basename($_SERVER['SCRIPT_NAME']),
         ))->append(array(
             'page_cache'            => true,
@@ -89,13 +89,9 @@ public function getSitePath($path = null)
     public function getUrlPrefix()
     {
         //Handle Joomla context
-        if(JFactory::getApplication()->getCfg('sef_rewrite') || JFactory::getApplication()->getCfg('live_site'))
+        if(JFactory::getApplication()->getCfg('sef_rewrite'))
         {
            $path = '';
-           if($base = JFactory::getApplication()->getCfg('live_site')) {
-                $path .= $base;
-           }
-
            if(!JFactory::getApplication()->getCfg('sef_rewrite')) {
                 $path = !empty($path) ? $path.'/index.php' : 'index.php';
            }