diff --git a/lib/router.php b/lib/router.php
index e956b02c63..e3a9203e4d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -126,6 +126,15 @@ class Router
         return Router::$inst;
     }
 
+    /**
+     * Clear the global singleton instance for this class.
+     * Needed to ensure reset when switching site configurations.
+     */
+    static function clear()
+    {
+        Router::$inst = null;
+    }
+
     function __construct()
     {
         if (empty($this->m)) {
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 85b46bbb3f..2c38fc205f 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -107,6 +107,8 @@ class StatusNet
      */
     public static function init($server=null, $path=null, $conffile=null)
     {
+        Router::clear();
+
         StatusNet::initDefaults($server, $path);
         StatusNet::loadConfigFile($conffile);