diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index d32abca2ef..0958f875e3 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -153,6 +153,9 @@ RiaApplication::RiaApplication()
 RiaApplication::~RiaApplication()
 {
     delete m_preferences;
+    delete m_project;
+
+    RiaFontCache::clear();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Application/RiaFontCache.cpp b/ApplicationCode/Application/RiaFontCache.cpp
index bcf15128cb..3ffa7ec491 100644
--- a/ApplicationCode/Application/RiaFontCache.cpp
+++ b/ApplicationCode/Application/RiaFontCache.cpp
@@ -129,3 +129,11 @@ RiaFontCache::FontSize RiaFontCache::fontSizeEnumFromPointSize( int pointSize )
     }
     return closestEnumValue;
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaFontCache::clear()
+{
+    ms_fonts.clear();
+}
diff --git a/ApplicationCode/Application/RiaFontCache.h b/ApplicationCode/Application/RiaFontCache.h
index 27e1ac02cb..59b28cdd56 100644
--- a/ApplicationCode/Application/RiaFontCache.h
+++ b/ApplicationCode/Application/RiaFontCache.h
@@ -56,6 +56,8 @@ public:
     static int                           pointSizeFromFontSizeEnum( FontSize fontSize );
     static FontSize                      fontSizeEnumFromPointSize( int pointSize );
 
+    static void clear();
+
 private:
     static std::map<FontSize, cvf::ref<caf::FixedAtlasFont>> ms_fonts;
 };