diff --git a/Source/WPEFramework/PluginHost.cpp b/Source/WPEFramework/PluginHost.cpp
index 0fb5421b6..a52940406 100644
--- a/Source/WPEFramework/PluginHost.cpp
+++ b/Source/WPEFramework/PluginHost.cpp
@@ -255,7 +255,10 @@ POP_WARNING()
                 fprintf(stdout, EXPAND_AND_QUOTE(APPLICATION_NAME) " completely stopped.\n");
                 fflush(stderr);
             }
+
             _atExitActive = false;
+
+            exit(0);
         }
 
     private:
@@ -330,7 +333,6 @@ POP_WARNING()
             sigaction(SIGSEGV, &_originalSegmentationHandler, nullptr);
             sigaction(SIGABRT, &_originalAbortHandler, nullptr);
 
-
             ExitHandler::DumpMetadata();
 
             if (_background) {
@@ -340,7 +342,7 @@ POP_WARNING()
                 fflush(stderr);
             }
 
-            ExitHandler::StartShutdown();
+            raise(signo);
         }
         else if (signo == SIGUSR1) {
             ExitHandler::DumpMetadata();