diff --git a/ckeditor.install b/ckeditor.install
index 4c8447b..4d5f945 100644
--- a/ckeditor.install
+++ b/ckeditor.install
@@ -314,7 +314,15 @@ function _ckeditor_requirements_getinstalledversion() {
 function _ckeditor_requirements_ckfinder_config_check($profile_name) {
   global $base_url;
   module_load_include('module', 'ckeditor');
-  $config_path = ckfinder_path('local') . '/config.php';
+
+  $path = ckfinder_path('local');
+
+  // CKFinder is optional - if the path is unassigned then it isn't installed.
+  if (empty($path)) {
+    return;
+  }
+
+  $config_path = $path . '/config.php';
 
   if (!file_exists($config_path)) {
     return t('!ckfinder is not installed correctly: <code>!config</code> not found. Make sure that you uploaded all files and did not accidentally remove the configuration file. If you installed CKFinder in other location (e.g. in the libraries folder), make sure to update the path to CKFinder in !global.', array(
diff --git a/ckeditor.module b/ckeditor.module
index 630714d..e58667f 100644
--- a/ckeditor.module
+++ b/ckeditor.module
@@ -542,7 +542,7 @@ function ckfinder_path($mode = 'relative', $refresh = FALSE) {
     switch ($mode) {
       default:
       case 'relative':
-        if ($global_profile && isset($global_profile->settings['ckfinder_path'])) {
+        if ($global_profile && !empty($global_profile->settings['ckfinder_path'])) {
           $ckfinder_path = $global_profile->settings['ckfinder_path'];
           $ckfinder_path = strtr($ckfinder_path, array("%b" => ckeditor_base_path('relative'), "%m" => ckeditor_module_path('relative'), "%l" => ckeditor_library_path('relative')));
           $ckfinder_path = str_replace('\\', '/', $ckfinder_path);
@@ -555,7 +555,7 @@ function ckfinder_path($mode = 'relative', $refresh = FALSE) {
           if (!empty($global_profile->settings['ckfinder_local_path'])) {
             return $cke_static[$mode] = $global_profile->settings['ckfinder_local_path'];
           }
-          if (isset($global_profile->settings['ckfinder_path'])) {
+          if (!empty($global_profile->settings['ckfinder_path'])) {
             $ckfinder_path = $global_profile->settings['ckfinder_path'];
             $ckfinder_path = strtr($ckfinder_path, array("%b" => ckeditor_base_path('local'), "%m" => ckeditor_module_path('local'), "%l" => ckeditor_library_path('local')));
             return $cke_static[$mode] = $ckfinder_path;
@@ -563,7 +563,7 @@ function ckfinder_path($mode = 'relative', $refresh = FALSE) {
         }
         return $cke_static[$mode] = ckeditor_module_path('local') . '/ckfinder';
       case 'url':
-        if ($global_profile && isset($global_profile->settings['ckfinder_path'])) {
+        if ($global_profile && !empty($global_profile->settings['ckfinder_path'])) {
           $ckfinder_path = $global_profile->settings['ckfinder_path'];
           $ckfinder_path = strtr($ckfinder_path, array("%m" => ckeditor_module_path('url'), "%l" => ckeditor_library_path('url')));
           $ckfinder_path = str_replace('\\', '/', $cke_plugins_path);
diff --git a/includes/ckeditor.admin.inc b/includes/ckeditor.admin.inc
index f9f84a4..015127a 100644
--- a/includes/ckeditor.admin.inc
+++ b/includes/ckeditor.admin.inc
@@ -354,7 +354,7 @@ function ckeditor_admin_global_profile_form($form, $form_state, $mode = 'add') {
   $form['ckeditor_advanced_settings']['ckfinder_path'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to CKFinder'),
-    '#default_value' => !empty($profile->settings['ckfinder_path']) ? $profile->settings['ckfinder_path'] : '%m/ckfinder',
+    '#default_value' => !empty($profile->settings['ckfinder_path']) ? $profile->settings['ckfinder_path'] : '',
     '#size' => 40,
     '#maxlength' => 128,
     '#description' => t(
@@ -542,7 +542,7 @@ function ckeditor_admin_global_profile_form_submit($form, &$form_state) {
     $edit['ckfinder_path'] = '';
   }
   $edit['ckfinder_path'] = trim(rtrim($edit['ckfinder_path'], "/"));
-  if ($edit['ckfinder_path'] && 0 !== strpos($edit['ckfinder_path'], "/") && 0 !== strpos($edit['ckfinder_path'], "%")) {
+  if (!empty($edit['ckfinder_path']) && 0 !== strpos($edit['ckfinder_path'], "/") && 0 !== strpos($edit['ckfinder_path'], "%")) {
     //ensure that slash is at the beginning
     $edit['ckfinder_path'] = "/" . $edit['ckfinder_path'];
   }