diff --git a/leeloo/lib/leeloo/keystore.rb b/leeloo/lib/leeloo/keystore.rb
index 6d49f96..6beacec 100644
--- a/leeloo/lib/leeloo/keystore.rb
+++ b/leeloo/lib/leeloo/keystore.rb
@@ -72,7 +72,7 @@ class PrivateLocalFileSystemKeystore < Keystore
     def initialize name, path
       super name
       @path = path
-      File.write("#{@path}/.gpg-id", 'empty')
+      File.write("#{@path}/.gpg-id", 'empty') unless File.exist? "#{@path}/.gpg-id"
       FileUtils.mkdir_p "#{@path}/secrets"
     end
 
diff --git a/leeloo/lib/leeloo/version.rb b/leeloo/lib/leeloo/version.rb
index 4384469..6deae31 100644
--- a/leeloo/lib/leeloo/version.rb
+++ b/leeloo/lib/leeloo/version.rb
@@ -1,4 +1,4 @@
 module Leeloo
-  VERSION     = '0.5.3'.freeze
+  VERSION     = '0.5.4'.freeze
   DESCRIPTION = "The easiest way to share securely your secrets".freeze
 end