diff --git a/js/Application.js b/js/Application.js
index 05714e9..9d8bf66 100644
--- a/js/Application.js
+++ b/js/Application.js
@@ -3,9 +3,6 @@ Ext.define('PMG.Application', {
 
     name: 'PMG',
 
-    // default fragment for the router
-    defaultToken: 'pmgDashboard',
-
     stores: [
 	'NavigationStore'
     ],
diff --git a/js/MainView.js b/js/MainView.js
index a4211df..4b4a22c 100644
--- a/js/MainView.js
+++ b/js/MainView.js
@@ -142,7 +142,7 @@ Ext.define('PMG.MainView', {
 	    });
 
 	    // select treeitem and load page from url fragment
-	    var token = Ext.util.History.getToken();
+	    var token = Ext.util.History.getToken() || 'pmgDashboard';
 	    this.redirectTo(token, true);
 
 	}
diff --git a/js/QuarantineView.js b/js/QuarantineView.js
index 277b803..3855b4f 100644
--- a/js/QuarantineView.js
+++ b/js/QuarantineView.js
@@ -179,8 +179,7 @@ Ext.define('PMG.QuarantineView', {
 		me.execQuarantineAction(qa);
 	    } else {
 		// select treeitem and load page from url fragment
-		var token = Ext.util.History.getToken();
-		if (!token || token === 'pmgDashboard') token = 'pmgSpamQuarantine'; // hack
+		var token = Ext.util.History.getToken() || 'pmgSpamQuarantine';
 		this.redirectTo(token, true);
 	    }
 	}