diff --git a/src/Yam/Servant.hs b/src/Yam/Servant.hs
--- a/src/Yam/Servant.hs
+++ b/src/Yam/Servant.hs
@@ -124,22 +124,22 @@
           -> IO ()
 startMain initialize providers migrateSql jobs application = do
   context <- defaultContext >>= initialize
-  runAppM context $ do
-    mds  <- getProp "datasource"
-    ds2nd<- getProp "datasource.secondary"
-    conf <- getPropOrDefault def ""
-    initDB providers mds ds2nd $ do
-      jobs >>= mapM_ registerJob
-      lockExtenstion
-      context <- ask
-      logger  <- toWaiLogger
-      let pt       = port (conf :: Config)
-          settings = setPort pt
-                   $ setLogger logger defaultSettings
-      liftIO  $ runSettings settings
-              $ middleWare  context
-              $ application context
-  where initDB :: [DataSourceProvider (AppM IO) ()] -> Maybe DataSource -> Maybe DataSource -> AppM IO () -> AppM IO ()
-        initDB _ Nothing  _   action = action
-        initDB p (Just v) ds2 action = initDataSource p v ds2 action
+  runAppM context $ go `finally` killJobs
+  where go :: AppM IO ()
+        go = do mds  <- getPropOrDefault def "datasource"
+                ds2nd<- getProp              "datasource.secondary"
+                conf <- getPropOrDefault def ""
+                initDB providers mds ds2nd $ do
+                  jobs >>= mapM_ registerJob
+                  lockExtenstion
+                  context <- ask
+                  logger  <- toWaiLogger
+                  let pt       = port (conf :: Config)
+                      settings = setPort pt
+                               $ setLogger logger defaultSettings
+                  liftIO  $ runSettings settings
+                          $ middleWare  context
+                          $ application context
+        initDB :: [DataSourceProvider (AppM IO) ()] -> DataSource -> Maybe DataSource -> AppM IO () -> AppM IO ()
+        initDB p v ds2 action = initDataSource p v ds2 action
 
diff --git a/yam-servant.cabal b/yam-servant.cabal
--- a/yam-servant.cabal
+++ b/yam-servant.cabal
@@ -1,5 +1,5 @@
 name:                yam-servant
-version:             0.1.3
+version:             0.1.4
 description:         Web Module for Yam
 homepage:            https://github.com/leptonyu/yam/yam-servant#readme
 license:             BSD3