diff --git a/src/module.c b/src/module.c
index 82ba9f86c..7e0a419b6 100644
--- a/src/module.c
+++ b/src/module.c
@@ -5698,6 +5698,23 @@ int moduleUnload(sds name) {
         errno = EPERM;
         return REDISMODULE_ERR;
     }
+    
+    /* Give module a chance to clean up. */
+    int (*onunload)(void *);
+    onunload = (int (*)(void *))(unsigned long) dlsym(module->handle, "RedisModule_OnUnload");
+    if (onunload) {
+        RedisModuleCtx ctx = REDISMODULE_CTX_INIT;
+        ctx.module = module;
+        ctx.client = moduleFreeContextReusedClient;
+        int unload_status = onunload((void*)&ctx);
+        moduleFreeContext(&ctx);
+
+        if (unload_status == REDISMODULE_ERR) {
+            serverLog(LL_WARNING, "Module %s OnUnload failed.  Unload canceled.", name);
+            errno = ECANCELED;
+            return REDISMODULE_ERR;
+        }
+    }
 
     moduleUnregisterCommands(module);
     moduleUnregisterSharedAPI(module);