diff --git a/config.json b/config.json
index d68f71dc28d4135f3d4ac9d55d2f7b9319d5ca3e..019c1d3f8ea8f474c36c94d644bd6f902473921c 100644
--- a/config.json
+++ b/config.json
@@ -7,6 +7,7 @@   "tor_proxy_addr": "socks5://127.0.0.1:9050",
   "max_statuses": 40,
   "per_status_mode": false,
   "enabled_nsfw": true,
+  "nsfw_only": false,
   "hide_reblogs": false,
   "default_content_type": "text/plain",
   "default_visibility": "unlisted",
diff --git a/pleroma-cli.sh b/pleroma-cli.sh
index dcb5339df8a4be73ab0cb36ac9472d3e775ef3ee..5045bbf8b01c65162d111ee2d783b543d247af04 100755
--- a/pleroma-cli.sh
+++ b/pleroma-cli.sh
@@ -28,6 +28,7 @@ instance_point="$default_connect_protocol://$instance/api/v1"
 instance_point_pleroma="$default_connect_protocol://$instance/api/pleroma"
 instance_hist='instance.hist'
 enabled_nsfw=$(jj -i config.json enabled_nsfw)
+nsfw_only=$(jj -i config.json nsfw_only)
 hide_reblogs=$(jj -i config.json hide_reblogs)
 max_statuses=$(jj -i config.json max_statuses)
 default_visibility=$(jj -i config.json default_visibility)
@@ -405,10 +406,26 @@ 		reblog=$(echo "$status" | jj reblog.id)
 		if [ "$hide_reblogs" = 'true' ] && [ -n "$reblog" ]; then
 			continue
 		fi
+
 		sensitive=$(echo "$status" | jj sensitive)
-		if [ "$enabled_nsfw" = 'false' ] && [ "$sensitive" = 'true' ]; then
-			continue
+		sensitive_reblog=$(echo "$status" | jj reblog.sensitive)
+
+		if [ -n "$reblog" ]; then
+			if [ "$enabled_nsfw" = 'false' ] && [ "$sensitive_reblog" = 'true' ]; then
+				continue
+			fi
+			if [ "$nsfw_only" = 'true' ] && [ "$sensitive_reblog" = 'false' ]; then
+				continue
+			fi
+		else
+			if [ "$enabled_nsfw" = 'false' ] && [ "$sensitive" = 'true' ]; then
+				continue
+			fi
+			if [ "$nsfw_only" = 'true' ] && [ "$sensitive" = 'false' ]; then
+				continue
+			fi
 		fi
+
 		whoacct=$(echo "$status" | jj account.acct)
 		reblogacct=$(echo "$status" | jj reblog.account.acct)
 		uri=$(echo "$status" | jj uri)
@@ -433,7 +450,7 @@ 		spoiler_text=$(echo "$status" | jj spoiler_text)
 		if [ -n "$spoiler_text" ]; then
 			echo "#[$spoiler_text]"
 		fi
-		if [ "$sensitive" = 'true' ]; then
+		if [ "$sensitive" = 'true' -o "$sensitive_reblog" = 'true' ]; then
 			echo '[NSFW]'
 		fi
 		echo "$status" | jj -r content | delqse | html_to_txt_render 
@@ -455,7 +472,7 @@ 				case "$per_status_menu" in
 					"Next") next=1; clear ;;
 					"Media")
 					for one_media in $attachments; do
-						curl -s --tcp-fastopen "$one_media" --output - | mpv -
+						mpv "$one_media"
 					done
 					;;
 					"Share and favorite") share_and_favorite_mode "$id_status" ;;