diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java
index 37d4b70f5c4..d4f19eba376 100644
--- a/usage/src/com/cloud/usage/UsageServer.java
+++ b/usage/src/com/cloud/usage/UsageServer.java
@@ -25,7 +25,6 @@ import org.apache.commons.daemon.DaemonInitException;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.xml.DOMConfigurator;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.util.Log4jConfigurer;
 
@@ -36,7 +35,8 @@ public class UsageServer implements Daemon {
     private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName());
     public static final String Name = "usage-server";
 
-    UsageManager mgr;
+    private UsageManager mgr;
+    private ClassPathXmlApplicationContext appContext;
 
     /**
      * @param args
@@ -54,7 +54,8 @@ public class UsageServer implements Daemon {
 
     @Override
     public void start() {
-        ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
+
+        appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
 
         try {
             ComponentContext.initComponentsLifeCycle();
@@ -73,7 +74,7 @@ public class UsageServer implements Daemon {
 
     @Override
     public void stop() {
-
+        appContext.close();
     }
 
     @Override