diff --git a/docker/rundeck/remco/templates/rundeck-config-storage.properties b/docker/rundeck/remco/templates/rundeck-config-storage.properties
index 8376593..10e119d 100644
--- a/docker/rundeck/remco/templates/rundeck-config-storage.properties
+++ b/docker/rundeck/remco/templates/rundeck-config-storage.properties
@@ -6,7 +6,12 @@ rundeck.storage.provider.{{index}}.type={% set type = printf("%s/type", provider
 rundeck.storage.provider.{{index}}.path={% set path = printf("%s/path", provider) %}{{ getv(path, "keys")}}
 rundeck.storage.provider.{{index}}.removePathPrefix={% set removepathprefix = printf("%s/removepathprefix", provider) %}{{ getv(removepathprefix, "false")}}
 
+{%- set prefix = getv(printf("%s/config/prefix", provider), "") %}
+{% if prefix %}
+
 rundeck.storage.provider.{{index}}.config.prefix={% set prefix = printf("%s/config/prefix", provider) %}{{ getv(prefix, "")}}
+{% endif %}
+
 rundeck.storage.provider.{{index}}.config.address={% set address = printf("%s/config/address", provider) %}{{ getv(address, "")}}
 rundeck.storage.provider.{{index}}.config.storageBehaviour={% set behaviour = printf("%s/config/behaviour", provider) %}{{ getv(behaviour, "rundeck")}}
 rundeck.storage.provider.{{index}}.config.secretBackend={% set secretbackend = printf("%s/config/secretbackend", provider) %}{{ getv(secretbackend, "secret")}}
diff --git a/docker/vault/run.sh b/docker/vault/run.sh
index 1273a38..938a87c 100755
--- a/docker/vault/run.sh
+++ b/docker/vault/run.sh
@@ -15,6 +15,12 @@ if (( $version > 1 )); then
     vault kv put secret/app/folder/another.secret test=hello
     vault kv put secret/app/folder/multiple2 name=admin password=admin server=rundeck
 
+    vault secrets enable -version=2 -path=rundeck kv
+    vault kv put rundeck/simple.secret foo=world
+    vault kv put rundeck/multiples name=admin password=admin server=rundeck
+    vault kv put rundeck/folder/another.secret test=hello
+    vault kv put rundeck/folder/multiple2 name=admin password=admin server=rundeck
+
 else
     echo "Vault 0.x"
 
diff --git a/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java b/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java
index 18089bf..bb097ea 100644
--- a/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java
+++ b/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java
@@ -259,7 +259,7 @@ protected int calculateGuaranteedTokenValidity(Properties configuration) {
     }
 
     public static String getVaultPath(String rawPath, String vaultSecretBackend, String vaultPrefix) {
-        String path= String.format("%s/%s/%s", vaultSecretBackend, vaultPrefix, rawPath);
+        String path= vaultPrefix != null && !vaultPrefix.equals("") ? String.format("%s/%s/%s", vaultSecretBackend, vaultPrefix, rawPath) : String.format("%s/%s", vaultSecretBackend, rawPath);
         return path;
     }