diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
deleted file mode 100644
index d1a26b3ca2..0000000000
--- a/mod/toggle_mobile.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-use Friendica\App;
-
-function toggle_mobile_init(App $a) {
-
-	if (isset($_GET['off'])) {
-		$_SESSION['show-mobile'] = false;
-	} else {
-		$_SESSION['show-mobile'] = true;
-	}
-
-	if (isset($_GET['address'])) {
-		$address = $_GET['address'];
-	} else {
-		$address = '';
-	}
-
-	$a->redirect($address);
-}
diff --git a/src/App/Router.php b/src/App/Router.php
index cd59c3dd90..d35b86fd74 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -201,6 +201,7 @@ class Router
 		$this->routeCollector->addRoute(['GET'],         '/rsd.xml',             Module\ReallySimpleDiscovery::class);
 		$this->routeCollector->addRoute(['GET'],         '/smilies[/json]',      Module\Smilies::class);
 		$this->routeCollector->addRoute(['GET'],         '/statistics.json',     Module\Statistics::class);
+		$this->routeCollector->addRoute(['GET'],         '/toggle_mobile',       Module\ToggleMobile::class);
 		$this->routeCollector->addRoute(['GET'],         '/tos',                 Module\Tos::class);
 		$this->routeCollector->addRoute(['GET'],         '/viewsrc/{item:\d+}',  Module\ItemBody::class);
 		$this->routeCollector->addRoute(['GET'],         '/webfinger',           Module\WebFinger::class);
diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php
new file mode 100644
index 0000000000..9788c0b5db
--- /dev/null
+++ b/src/Module/ToggleMobile.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+
+/**
+ * Toggles the mobile view (on/off)
+ */
+class ToggleMobile extends BaseModule
+{
+	public static function content()
+	{
+		$a = self::getApp();
+
+		if (isset($_GET['off'])) {
+			$_SESSION['show-mobile'] = false;
+		} else {
+			$_SESSION['show-mobile'] = true;
+		}
+
+		if (isset($_GET['address'])) {
+			$address = $_GET['address'];
+		} else {
+			$address = '';
+		}
+
+		$a->redirect($address);
+	}
+}