diff --git a/manifests/master/routes.pp b/manifests/master/routes.pp
index 8920610..fcdda80 100644
--- a/manifests/master/routes.pp
+++ b/manifests/master/routes.pp
@@ -1,51 +1,51 @@
 # Manages the routes configuration file on the master. See README.md for more
 # details.
 class puppetdb::master::routes (
   $puppet_confdir = $puppetdb::params::puppet_confdir,
   $masterless     = $puppetdb::params::masterless,
   $routes         = undef,
 ) inherits puppetdb::params {
 
   if $masterless {
     $routes_real = {
       'apply' => {
         'catalog' => {
           'terminus' => 'compiler',
           'cache'    => 'puppetdb',
         },
         'facts'   => {
           'terminus' => 'facter',
           'cache'    => 'puppetdb_apply',
         }
       }
     }
   } elsif $routes {
     $routes_real = $routes
   } else {
-    if versioncmp($serverversion, '7.0') == -1 {
-      $default_fact_cache = 'yaml'
-    } else {
+    if (defined('$serverversion')) and (versioncmp($serverversion, '7.0') >= 0) {
       $default_fact_cache = 'json'
+    } else {
+      $default_fact_cache = 'yaml'
     }
     $routes_real = {
       'master' => {
         'facts' => {
           'terminus' => 'puppetdb',
           'cache'    => $default_fact_cache,
         }
       }
     }
   }
 
   # TODO: this will overwrite any existing routes.yaml;
   #  to handle this properly we should just be ensuring
   #  that the proper settings exist, but to do that we'd need
   #  to parse the yaml file and rewrite it, dealing with indentation issues etc
   #  I don't think there is currently a puppet module or an augeas lens for
   #  this.
   file { "${puppet_confdir}/routes.yaml":
     ensure  => file,
     content => template('puppetdb/routes.yaml.erb'),
     mode    => '0644',
   }
 }