diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e5ad2c5ae..e708fdbf2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -386,11 +386,11 @@ set(HEADERS
             telemetry_session.h
             )
 
-set(SYSTEM_ARCHIVES
-            ../../dist/shared_font.app.romfs.h
-            )
-create_directory_groups(${SRCS} ${HEADERS} ${SYSTEM_ARCHIVES})
-add_library(core STATIC ${SRCS} ${HEADERS} ${SYSTEM_ARCHIVES})
+create_directory_groups(${SRCS} ${HEADERS})
+add_library(core STATIC ${SRCS} ${HEADERS})
+if (ENABLE_CUSTOM_SYSTEM_ARCHIVES)
+    target_include_directories(core INTERFACE "${CUSTOM_ARCHIVES_PREFIX}")
+endif()
 target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt)
 if (ENABLE_WEB_SERVICE)
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 5b70e777b..c5e18401b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -228,7 +228,6 @@ void System::SystemIntegrityCheck() {
         if (file->IsOpen()) {
             file->Close();
             LOG_INFO(Core, "SystemCheck: Shared Font(legacy) exists.");
-            return true;
         } else {
             LOG_ERROR(Core, "SystemCheck: Shared Font missing.");
             system_integrity = static_cast<Integrity>(system_integrity | Integrity::SharedFont);