diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index a8f0b59250..1010707124 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -80,18 +80,10 @@ class Storage extends BaseAdmin
 	{
 		parent::content($parameters);
 
-		$current_storage_backend    = DI::storage();
-		$available_storage_backends = [];
-		$available_storage_forms    = [];
-
-		// show legacy option only if it is the current backend:
-		// once changed can't be selected anymore
-		if ($current_storage_backend == null) {
-			$available_storage_backends[''] = DI::l10n()->t('Database (legacy)');
-		}
+		$current_storage_backend = DI::storage();
+		$available_storage_forms = [];
 
 		foreach (DI::storageManager()->listBackends() as $name => $class) {
-			$available_storage_backends[$name] = $name;
 
 			// build storage config form,
 			$storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|', '', $name);
@@ -116,7 +108,7 @@ class Storage extends BaseAdmin
 				'name'   => $name,
 				'prefix' => $storage_form_prefix,
 				'form'   => $storage_form,
-				'active' => $name === $current_storage_backend::getName(),
+				'active' => $current_storage_backend instanceof IStorage && $name === $current_storage_backend::getName(),
 			];
 		}
 
@@ -132,7 +124,7 @@ class Storage extends BaseAdmin
 			'$noconfig'              => DI::l10n()->t('This backend doesn\'t have custom settings'),
 			'$baseurl'               => DI::baseUrl()->get(true),
 			'$form_security_token'   => self::getFormSecurityToken("admin_storage"),
-			'$storagebackend'        => $current_storage_backend,
+			'$storagebackend'        => $current_storage_backend instanceof IStorage ? $current_storage_backend::getName() : DI::l10n()->t('Database (legacy)'),
 			'$availablestorageforms' => $available_storage_forms,
 		]);
 	}
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index e40f7918c2..d747853d64 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -968,7 +968,7 @@ msgid "Edit post"
 msgstr ""
 
 #: mod/editpost.php:88 mod/notes.php:63 src/Content/Text/HTML.php:885
-#: src/Module/Admin/Storage.php:128 src/Module/Filer/SaveTag.php:69
+#: src/Module/Admin/Storage.php:120 src/Module/Filer/SaveTag.php:69
 msgid "Save"
 msgstr ""
 
@@ -4999,7 +4999,7 @@ msgstr ""
 #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159
 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80
 #: src/Module/Admin/Logs/View.php:64 src/Module/Admin/Queue.php:72
-#: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:126
+#: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:118
 #: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58
 #: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137
@@ -6462,30 +6462,30 @@ msgstr ""
 msgid "Invalid storage backend setting value."
 msgstr ""
 
-#: src/Module/Admin/Storage.php:90
-msgid "Database (legacy)"
-msgstr ""
-
-#: src/Module/Admin/Storage.php:127 src/Module/BaseAdmin.php:91
+#: src/Module/Admin/Storage.php:119 src/Module/BaseAdmin.php:91
 msgid "Storage"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:129
+#: src/Module/Admin/Storage.php:121
 msgid "Save & Activate"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:130
+#: src/Module/Admin/Storage.php:122
 msgid "Activate"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:131
+#: src/Module/Admin/Storage.php:123
 msgid "Save & Reload"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:132
+#: src/Module/Admin/Storage.php:124
 msgid "This backend doesn't have custom settings"
 msgstr ""
 
+#: src/Module/Admin/Storage.php:127
+msgid "Database (legacy)"
+msgstr ""
+
 #: src/Module/Admin/Summary.php:53
 #, php-format
 msgid "Template engine (%s) error: %s"