diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index 25e57875..3c9688ed 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -1,4 +1,7 @@
 
+// C++ includes
+#include <csignal>
+
 // QT includes
 #include <QCoreApplication>
 
@@ -14,12 +17,20 @@
 // JsonServer includes
 #include <jsonserver/JsonServer.h>
 
+void signal_handler(const int signum)
+{
+	QCoreApplication::quit();
+}
+
 int main(int argc, char** argv)
 {
 	// Initialising QCoreApplication
 	QCoreApplication app(argc, argv);
 	std::cout << "QCoreApplication initialised" << std::endl;
 
+	signal(SIGINT,  signal_handler);
+	signal(SIGTERM, signal_handler);
+
 	if (argc < 2)
 	{
 		std::cout << "Missing required configuration file. Usage:" << std::endl;
@@ -42,4 +53,9 @@ int main(int argc, char** argv)
 
 	app.exec();
 	std::cout << "Application closed" << std::endl;
+
+	// Stop the frame grabber
+	dispmanx.stop();
+	// Clear all colors (switchting off all leds)
+	hyperion.clearall();
 }