diff --git a/src/switch_pcm.c b/src/switch_pcm.c
index 6aa038167c..bb5fcc4e5d 100644
--- a/src/switch_pcm.c
+++ b/src/switch_pcm.c
@@ -38,7 +38,8 @@
 #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport)
 #endif
 SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load);
-SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, NULL, NULL);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(core_pcm_shutdown);
+SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, core_pcm_shutdown, NULL);
 
 static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
 {
@@ -343,6 +344,11 @@ SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load)
 	return SWITCH_STATUS_SUCCESS;
 }
 
+SWITCH_MODULE_SHUTDOWN_FUNCTION(core_pcm_shutdown)
+{
+	return SWITCH_STATUS_NOUNLOAD;
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c
diff --git a/src/switch_time.c b/src/switch_time.c
index 3e0e991adb..b7ba9c4abc 100644
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -466,7 +466,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
 #endif
 
 
-	return SWITCH_STATUS_SUCCESS;
+	return SWITCH_STATUS_NOUNLOAD;
 }
 
 /* For Emacs: