diff --git a/hm/modules/common/shellenv/default.nix b/hm/modules/common/shellenv/default.nix
index c53e52a..fa050e5 100644
--- a/hm/modules/common/shellenv/default.nix
+++ b/hm/modules/common/shellenv/default.nix
@@ -49,9 +49,9 @@ in
       maintenance.enable = true;
       extraConfig = {
         init.defaultBranch = "main";
-        safe.directory = [
-          osConfig.liminalOS.flakeLocation
-        ];
+        safe.directory = lib.mkIf (
+          osConfig.liminalOS.flakeLocation != null
+        ) osConfig.liminalOS.flakeLocation;
       };
     };