diff --git a/game/special-masturbation/actions.twee b/game/special-masturbation/actions.twee
index 19f25b9a840fc35899ea5fbbb97c6743a8e1f732..02f14b95f0bb385699d9962cfa69e9053362830f 100644
--- a/game/special-masturbation/actions.twee
+++ b/game/special-masturbation/actions.twee
@@ -6,7 +6,7 @@
 <<if $currentToyRight is undefined>><<set $currentToyRight to "none">><</if>>
 <<set $_genitals_exposed to $worn.over_lower.vagina_exposed gte 1 and $worn.lower.vagina_exposed gte 1 and $worn.under_lower.vagina_exposed gte 1>>
 <<set $_balls_exposed to $_genitals_exposed and !($worn.genitals.type.includes("chastity") and $worn.genitals.type.includes("belt"))>>
-<<set $_playerToys to window.listUniqueCarriedSextoys()>>
+<<set $_playerToys to window.listUniqueCarriedSextoys().filter(toy => toy.type.contains("dildo"))>>
 <<if $currentToyLeft isnot undefined and $currentToyLeft isnot "none">>
 	<<set $_lefttoy to $_playerToys[$currentToyLeft].name>>
 	<<set $_lefttoycolour to $_playerToys[$currentToyLeft].colour>>
@@ -57,12 +57,10 @@
 		| <label><<radiobutton "$leftaction" "manusentrance" autocheck>> <span class="sub">Stroke your anus</span></label>
 	<</if>>
 	<<if $awareness gte 200 and ["home","brothel","cafe"].includes($location)>> <!-- v0.3.6.2: Player sex toys -->
-		<<if $_playerToys>>
+		<<if $_playerToys.length gte 1>>
 			<<set $_playertoysLeft to {}>>
 			<<for $_i = 0; $_i lt $_playerToys.length; $_i++>>
-				<<if $_playerToys[$_i].type.includes("dildo")>>
-					<<set $_playertoysLeft[($_playerToys[$_i].colour + " " + $_playerToys[$_i].name)] to $_i>>
-				<</if>>
+				<<set $_playertoysLeft[($_playerToys[$_i].colour + " " + $_playerToys[$_i].name)] to $_i>>
 			<</for>>
 			<<set $_toyoptions to $_playertoysLeft>>
 			<label><<radiobutton "$leftaction" "mpickupdildo" autocheck>> <span class="green">Use Toy:</span></label>
@@ -287,13 +285,11 @@
 		| <label><<radiobutton "$rightaction" "manusentrance" autocheck>> <span class="sub">Stroke your anus</span></label>
 	<</if>>
 	<<if $awareness gte 200 and ["home","brothel","cafe"].includes($location)>> /* Player sex toys */
-		<<if $_playerToys>>
+		<<if $_playerToys.length gte 1>>
 			<<set $_playertoysRight to {}>>
 			<<for $_i = 0; $_i lt $_playerToys.length; $_i++>>
 				/*<<set $_playertoysRight.push($_playerToys[$_i].namecap)>>*/
-				<<if $_playerToys[$_i].type.includes("dildo")>>
-					<<set $_playertoysRight[($_playerToys[$_i].colour + " " + $_playerToys[$_i].name)] to $_i>>
-				<</if>>
+				<<set $_playertoysRight[($_playerToys[$_i].colour + " " + $_playerToys[$_i].name)] to $_i>>
 			<</for>>
 			<<set $_toyoptions to $_playertoysRight>>
 			<label><<radiobutton "$rightaction" "mpickupdildo" autocheck>> <span class="green">Use Toy:</span></label>
diff --git a/game/special-masturbation/effects.twee b/game/special-masturbation/effects.twee
index af0d6633e132c6bc1d6c2b03ddf3e15990ef1890..ab68bc989f08d7a427055debe711dbd969ac10e9 100644
--- a/game/special-masturbation/effects.twee
+++ b/game/special-masturbation/effects.twee
@@ -1,7 +1,7 @@
 :: Widgets Masturbation Effects [widget]
 
 <<widget "masturbationeffects">>
-<<set $_playerToys to window.listUniqueCarriedSextoys()>>
+<<set $_playerToys to window.listUniqueCarriedSextoys().filter(toy => toy.type.contains("dildo"))>>
 <<if $currentToyLeft isnot undefined and $currentToyLeft isnot "none">>
 	<<set $_lefttoy to $_playerToys[$currentToyLeft].name>>
 	<<set $_lefttoycolour to $_playerToys[$currentToyLeft].colour>>