diff --git a/Enderal SE v2.1.0 Changelog.txt b/Enderal SE v2.1.0 Changelog.txt
index 4a21918d..dba7bdd5 100644
--- a/Enderal SE v2.1.0 Changelog.txt	
+++ b/Enderal SE v2.1.0 Changelog.txt	
@@ -57,6 +57,7 @@ Gameplay changes:
 - Ice Claws are now consumed without picking them up (inspired by root1's mod). Eating one shows a corner notification with new carry weight.
 - Oil pools ignite from shocking spells, fixed other cases when they did not ignite but should have.
 - Reduced damage dealt by Lords of the Lost Ones and Dal Galar's servants by 35%, slightly lowered damage from Elemental Wolves and Mad Rats.
+- Fixed pipe smoking, sometimes starting on reading some receipts and opening some containers (now for sure).
 - Moved hidden talking actors in Pentas' house out of player's reach.
 - Removed a few wolves from the Sun Coast.
 - Fixed Spriggan's visual effects.
diff --git a/Skyrim.esm b/Skyrim.esm
index 6430fdf0..1bacc0de 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00e_peaceweedplayeraliasscript.pex b/scripts/_00e_peaceweedplayeraliasscript.pex
index 896d8a32..7cebfc98 100644
Binary files a/scripts/_00e_peaceweedplayeraliasscript.pex and b/scripts/_00e_peaceweedplayeraliasscript.pex differ
diff --git a/scripts/_00e_smokingpipescript.pex b/scripts/_00e_smokingpipescript.pex
deleted file mode 100644
index adddfc67..00000000
Binary files a/scripts/_00e_smokingpipescript.pex and /dev/null differ
diff --git a/scripts/scriptarchiveorder.txt b/scripts/scriptarchiveorder.txt
index 40d279d9..55cb576b 100644
--- a/scripts/scriptarchiveorder.txt
+++ b/scripts/scriptarchiveorder.txt
@@ -1317,7 +1317,6 @@ scripts\_00e_slowselfmesc.pex
 scripts\_00e_smoking_crossleggedmarkerscript.pex
 scripts\_00e_smoking_crossleggedsc.pex
 scripts\_00e_smoking_wallmarkerscript.pex
-scripts\_00e_smokingpipescript.pex
 scripts\_00e_soultrapcontroller.pex
 scripts\_00E_SoundControl.pex
 scripts\_00e_stagetriggerboxscn.pex
diff --git a/source/scripts/_00e_peaceweedplayeraliasscript.psc b/source/scripts/_00e_peaceweedplayeraliasscript.psc
index 609dc68b..932b1917 100644
--- a/source/scripts/_00e_peaceweedplayeraliasscript.psc
+++ b/source/scripts/_00e_peaceweedplayeraliasscript.psc
@@ -80,6 +80,12 @@ State Smoking
 
 EndState
 
+Event OnObjectEquipped(Form akBaseObject, ObjectReference akReference)
+	if akBaseObject == _00E_SmokingPipe
+		StartSmoking()
+	endif
+endEvent
+
 
 ;=====================================================================================
 ;              							SMOKING                  					 
diff --git a/source/scripts/_00e_smokingpipescript.psc b/source/scripts/_00e_smokingpipescript.psc
deleted file mode 100644
index 29cab54c..00000000
--- a/source/scripts/_00e_smokingpipescript.psc
+++ /dev/null
@@ -1,14 +0,0 @@
-Scriptname _00E_SmokingPipeScript extends ObjectReference
-
-_00E_PeaceweedControlScript Property PeaceweedControl Auto
-Actor Property PlayerRef Auto
-
-Event OnEquipped(Actor akActor)
-	If akActor == PlayerRef
-		; The check of base object is needed because this script somehow gets attached to the quest ref of _00E_FS_NQ07_Rezept (and to various containers)
-		Form baseObj = GetBaseObject()
-		If baseObj == None || (baseObj as MiscObject) != None
-			PeaceweedControl.StartSmoking()
-		EndIf
-	EndIf
-EndEvent
\ No newline at end of file