diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 784218ad0e..ee625c234c 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -134,7 +134,6 @@
   ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
   ArmPkg/Library/ArmHvcLibNull/ArmHvcLibNull.inf
   ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
-  ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
   ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
   ArmPkg/Library/OpteeLib/OpteeLib.inf
   ArmPkg/Library/ArmTransferListLib/ArmTransferListLib.inf
diff --git a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c b/MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.c
similarity index 100%
rename from ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c
rename to MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.c
diff --git a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf b/MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
similarity index 93%
rename from ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
rename to MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
index 9ce7c9b477..de5bbdb98d 100644
--- a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
+++ b/MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
@@ -21,4 +21,3 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ArmPkg/ArmPkg.dec
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 65e333b9fb..a7c83e9dd2 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -208,6 +208,7 @@
   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
   MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
+  MdePkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
 
 [Components.RISCV64]
   MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf