diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp
index 7b388c465c9..c8fb2255264 100644
--- a/intern/cycles/device/cuda/device_impl.cpp
+++ b/intern/cycles/device/cuda/device_impl.cpp
@@ -135,7 +135,9 @@ CUDADevice::CUDADevice(const DeviceInfo &info, Stats &stats, Profiler &profiler)
 CUDADevice::~CUDADevice()
 {
   texture_info.free();
-
+  if (cuModule) {
+    cuda_assert(cuModuleUnload(cuModule));
+  }
   cuda_assert(cuDevicePrimaryCtxRelease(cuDevice));
 }
 
diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp
index af9e858acb9..9daf48dec34 100644
--- a/intern/cycles/device/hip/device_impl.cpp
+++ b/intern/cycles/device/hip/device_impl.cpp
@@ -126,7 +126,9 @@ HIPDevice::HIPDevice(const DeviceInfo &info, Stats &stats, Profiler &profiler)
 HIPDevice::~HIPDevice()
 {
   texture_info.free();
-
+  if (hipModule) {
+    hip_assert(hipModuleUnload(hipModule));
+  }
   hip_assert(hipCtxDestroy(hipContext));
 }