diff --git a/core/Migrations/Version20180319102121.php b/core/Migrations/Version20180319102121.php
new file mode 100644
index 000000000000..76f349481ee2
--- /dev/null
+++ b/core/Migrations/Version20180319102121.php
@@ -0,0 +1,22 @@
+<?php
+namespace OC\Migrations;
+
+use OCP\IDBConnection;
+use OCP\Migration\ISqlMigration;
+
+/**
+ * Sets empty authtoken names to '(none)'
+ * https://github.com/owncloud/core/issues/30792
+ */
+class Version20180319102121 implements ISqlMigration {
+
+	public function sql(IDBConnection $connection) {
+		$q = $connection->getQueryBuilder();
+		$q->update('authtoken')
+			->set('name', $q->expr()->literal('(none)'))
+			->where($q->expr()->eq('name', $q->expr()->literal('')))
+			->orWhere($q->expr()->isNull('name'));
+		return [$q->getSQL()];
+    }
+}
+