diff --git a/module/Dotenv.psd1 b/module/Dotenv.psd1
index d140a9d..c01931d 100644
--- a/module/Dotenv.psd1
+++ b/module/Dotenv.psd1
@@ -1,6 +1,6 @@
 @{
 	RootModule = "Dotenv.psm1"
-	ModuleVersion = "0.6.5"
+	ModuleVersion = "0.7.0"
 	Author = "Taylan Gökkaya<insomnimus.dev@gmail.com>"
 	CompatiblePSEditions = @("Core")
 	GUID = '3bb5d7a3-985c-4d74-a329-8dddb075e322'
diff --git a/module/Dotenv.psm1 b/module/Dotenv.psm1
index 3fa1f56..209caa5 100644
--- a/module/Dotenv.psm1
+++ b/module/Dotenv.psm1
@@ -1,4 +1,13 @@
 New-Variable -Option ReadOnly Dotenv ([Dotenv.Daemon]::new())
+
+$ExecutionContext.SessionState.Module.OnRemove += {
+	if($global:Dotenv.Enabled) {
+		Write-Host "dotenv: unloading..."
+		$global:Dotenv.Disable()
+		remove-item -force -ea silentlyContinue variable:/Dotenv
+	}
+}
+
 [string]$lastdir = $pwd.providerpath
 
 function Clear-DotenvJobs {