diff --git a/cmd/routers.go b/cmd/routers.go
index 17da5bb77..eb1053f9d 100644
--- a/cmd/routers.go
+++ b/cmd/routers.go
@@ -65,10 +65,6 @@ func newObjectLayerFactory(disks, ignoredDisks []string) func() ObjectLayer {
 		err = cleanupOldBucketPolicyConfigs()
 		fatalIf(err, "Unable to clean up bucket policy from config directory.")
 
-		// Initialize and monitor shutdown signals.
-		err = initGracefulShutdown(os.Exit)
-		fatalIf(err, "Unable to initialize graceful shutdown operation")
-
 		// Register the callback that should be called when the process shuts down.
 		globalShutdownCBs.AddObjectLayerCB(func() errCode {
 			if sErr := objAPI.Shutdown(); sErr != nil {
@@ -95,6 +91,10 @@ func configureServerHandler(srvCmdConfig serverCmdConfig) http.Handler {
 	storageRPCs, err := newRPCServer(srvCmdConfig)
 	fatalIf(err, "Unable to initialize storage RPC server.")
 
+	// Initialize and monitor shutdown signals.
+	err = initGracefulShutdown(os.Exit)
+	fatalIf(err, "Unable to initialize graceful shutdown operation")
+
 	newObjectLayerFn := newObjectLayerFactory(srvCmdConfig.disks, srvCmdConfig.ignoredDisks)
 	// Initialize API.
 	apiHandlers := objectAPIHandlers{