diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 7ef2fd303ac445..0a3a865a678e7d 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -80,6 +80,8 @@ static_library("app") {
     "DeviceProxy.h",
     "EventManagement.cpp",
     "EventPathParams.h",
+    "FailSafeContext.cpp",
+    "FailSafeContext.h",
     "GlobalAttributes.h",
     "InteractionModelEngine.cpp",
     "InteractionModelRevision.h",
diff --git a/src/app/server/FailSafeContext.cpp b/src/app/FailSafeContext.cpp
similarity index 100%
rename from src/app/server/FailSafeContext.cpp
rename to src/app/FailSafeContext.cpp
diff --git a/src/app/server/FailSafeContext.h b/src/app/FailSafeContext.h
similarity index 100%
rename from src/app/server/FailSafeContext.h
rename to src/app/FailSafeContext.h
diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn
index 2e0bb81ca26639..d77162909ee5e6 100644
--- a/src/app/server/BUILD.gn
+++ b/src/app/server/BUILD.gn
@@ -38,8 +38,6 @@ static_library("server") {
     "Dnssd.h",
     "EchoHandler.cpp",
     "EchoHandler.h",
-    "FailSafeContext.cpp",
-    "FailSafeContext.h",
     "OnboardingCodesUtil.cpp",
     "OnboardingCodesUtil.h",
     "Server.cpp",
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 96288dc0ba0453..13eac3aedd8a56 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -24,13 +24,13 @@
 #include <app/CASEClientPool.h>
 #include <app/CASESessionManager.h>
 #include <app/DefaultAttributePersistenceProvider.h>
+#include <app/FailSafeContext.h>
 #include <app/OperationalDeviceProxyPool.h>
 #include <app/TestEventTriggerDelegate.h>
 #include <app/server/AclStorage.h>
 #include <app/server/AppDelegate.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/DefaultAclStorage.h>
-#include <app/server/FailSafeContext.h>
 #include <credentials/CertificateValidityPolicy.h>
 #include <credentials/FabricTable.h>
 #include <credentials/GroupDataProvider.h>
diff --git a/src/app/tests/TestFailSafeContext.cpp b/src/app/tests/TestFailSafeContext.cpp
index 3632e369ba2501..85d6e096da0207 100644
--- a/src/app/tests/TestFailSafeContext.cpp
+++ b/src/app/tests/TestFailSafeContext.cpp
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <app/server/FailSafeContext.h>
+#include <app/FailSafeContext.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/UnitTestRegistration.h>