diff --git a/src/web/app/common/tags/number.tag b/src/web/app/common/tags/number.tag
index 7dcbceba6..7afb8b398 100644
--- a/src/web/app/common/tags/number.tag
+++ b/src/web/app/common/tags/number.tag
@@ -5,9 +5,7 @@
 	</style>
 	<script>
 		this.on('mount', () => {
-			// https://github.com/riot/riot/issues/2103
-			//value = this.opts.value
-			let value = this.opts.riotValue;
+			let value = this.opts.value;
 			const max = this.opts.max;
 
 			if (max != null && value > max) value = max;
diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index 0e5463fcb..49531a6a5 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -282,10 +282,7 @@
 			this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
 			this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
 
-			// Riotのバグでnullを渡しても""になる
-			// https://github.com/riot/riot/issues/2080
-			//if (this.opts.folder)
-			if (this.opts.folder && this.opts.folder != '') {
+			if (this.opts.folder) {
 				this.move(this.opts.folder);
 			} else {
 				this.fetch();
diff --git a/src/web/app/desktop/tags/drive/nav-folder.tag b/src/web/app/desktop/tags/drive/nav-folder.tag
index e961ac491..46ac26f90 100644
--- a/src/web/app/desktop/tags/drive/nav-folder.tag
+++ b/src/web/app/desktop/tags/drive/nav-folder.tag
@@ -8,10 +8,7 @@
 	<script>
 		this.mixin('api');
 
-		// Riotのバグでnullを渡しても""になる
-		// https://github.com/riot/riot/issues/2080
-		//this.folder = this.opts.folder
-		this.folder = this.opts.folder && this.opts.folder != '' ? this.opts.folder : null;
+		this.folder = this.opts.folder ? this.opts.folder : null;
 		this.browser = this.parent;
 
 		this.hover = false;
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index a913739af..7d27710d0 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -61,8 +61,6 @@
 		this.mixin('i');
 
 		this.mode = this.opts.mode || 'timeline';
-		// https://github.com/riot/riot/issues/2080
-		if (this.mode == '') this.mode = 'timeline';
 
 		const _home = {
 			left: [
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index ca6b5eb9d..2412bd741 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -320,14 +320,8 @@
 
 		this.inReplyToPost = this.opts.reply;
 
-		// https://github.com/riot/riot/issues/2080
-		if (this.inReplyToPost == '') this.inReplyToPost = null;
-
 		this.repost = this.opts.repost;
 
-		// https://github.com/riot/riot/issues/2080
-		if (this.repost == '') this.repost = null;
-
 		this.placeholder = this.repost
 			? '%i18n:desktop.tags.mk-post-form.quote-placeholder%'
 			: this.inReplyToPost
diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag
index 264f1c221..800cb9d7e 100644
--- a/src/web/app/mobile/tags/drive.tag
+++ b/src/web/app/mobile/tags/drive.tag
@@ -198,13 +198,9 @@
 			this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
 			this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
 
-			// Riotのバグでnullを渡しても""になる
-			// https://github.com/riot/riot/issues/2080
-			//if (this.opts.folder)
-			//if (this.opts.file)
-			if (this.opts.folder && this.opts.folder != '') {
+			if (this.opts.folder) {
 				this.cd(this.opts.folder, true);
-			} else if (this.opts.file && this.opts.file != '') {
+			} else if (this.opts.file) {
 				this.cf(this.opts.file, true);
 			} else {
 				this.fetch();