diff --git a/python/spdk/sma/sma.py b/python/spdk/sma/sma.py
index a268bb0a4..6bce442c0 100644
--- a/python/spdk/sma/sma.py
+++ b/python/spdk/sma/sma.py
@@ -24,9 +24,11 @@ class StorageManagementAgent(pb2_grpc.StorageManagementAgentServicer):
     def register_device(self, device_manager):
         self._devices[device_manager.protocol] = device_manager
 
-    def run(self):
+    def start(self):
         self._server.start()
-        self._server.wait_for_termination()
+
+    def stop(self):
+        self._server.stop(None)
 
     def _find_device_by_name(self, name):
         return self._devices.get(name)
diff --git a/scripts/sma.py b/scripts/sma.py
index cfaa7a302..679d720dd 100755
--- a/scripts/sma.py
+++ b/scripts/sma.py
@@ -4,7 +4,9 @@ from argparse import ArgumentParser
 import importlib
 import logging
 import os
+import signal
 import sys
+import threading
 import yaml
 
 sys.path.append(os.path.dirname(__file__) + '/../python')
@@ -72,6 +74,20 @@ def load_plugins(plugins, client):
     return devices
 
 
+def run(agent):
+    event = threading.Event()
+
+    def signal_handler(signum, frame):
+        event.set()
+
+    for signum in [signal.SIGTERM, signal.SIGINT]:
+        signal.signal(signum, signal_handler)
+
+    agent.start()
+    event.wait()
+    agent.stop()
+
+
 if __name__ == '__main__':
     logging.basicConfig(level=os.environ.get('SMA_LOGLEVEL', 'WARNING').upper())
 
@@ -85,5 +101,4 @@ if __name__ == '__main__':
     devices += load_plugins(filter(None, os.environ.get('SMA_PLUGINS', '').split(':')),
                             client)
     register_devices(agent, devices, config)
-
-    agent.run()
+    run(agent)