diff --git a/core/core.cpp b/core/core.cpp
index ec7bd281..645f45f8 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -21,3 +21,9 @@ void core :: init()
 	deck     :: init();
 	audio    :: init();
 }
+
+void core :: deinit()
+{
+	filter_deinit();
+	tags_deinit();
+}
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 9ec68564..29de8412 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -58,5 +58,7 @@ int main(int argc, char **argv)
 	ocarina_app->run(*window);
 	cleanup_tabs();
 	gst :: quit();
+	core :: deinit();
+
 	return 0;
 }
diff --git a/include/core/core.h b/include/core/core.h
index 95425432..d875c052 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -15,6 +15,7 @@ namespace core
 	 * databases from disk and setting up gstreamer.
 	 */
 	void init();
+	void deinit();
 
 }