diff --git a/src/ApiService/ApiService/onefuzzlib/Secrets.cs b/src/ApiService/ApiService/onefuzzlib/Secrets.cs
index 16a9ab3bca..127bd4c9c9 100644
--- a/src/ApiService/ApiService/onefuzzlib/Secrets.cs
+++ b/src/ApiService/ApiService/onefuzzlib/Secrets.cs
@@ -15,7 +15,7 @@ public async Task<SecretData<T>> StoreSecretData<T>(SecretData<T> secretData) {
         return new SecretData<T>(new SecretAddress<T>(address));
     }
 
-    public Task<T?> GetSecretValue<T>(ISecret<T> data);
+    public Task<T?> GetSecretValue<T>(ISecret<T> data) where T : class;
 
     Task<Uri> StoreSecret(ISecret secret);
 
@@ -52,14 +52,20 @@ public async Task<Uri> StoreSecret(ISecret secret) {
         };
     }
 
-    public async Task<T?> GetSecretValue<T>(ISecret<T> data) {
+    public async Task<T?> GetSecretValue<T>(ISecret<T> data) where T : class {
         switch ((data)) {
             case SecretAddress<T> secretAddress:
                 var secretValue = (await GetSecret(secretAddress.Url))?.Value;
                 if (secretValue is null)
                     return default;
+
+                if (typeof(T) == typeof(string)) {
+                    return secretValue as T;
+                }
+
                 return JsonSerializer.Deserialize<T>(secretValue, EntityConverter.GetJsonSerializerOptions());
 
+
             case SecretValue<T> sValue:
                 return sValue.Value;
 
diff --git a/src/ApiService/Tests/OrmTest.cs b/src/ApiService/Tests/OrmTest.cs
index e8936b7cd6..d52080b6a5 100644
--- a/src/ApiService/Tests/OrmTest.cs
+++ b/src/ApiService/Tests/OrmTest.cs
@@ -20,7 +20,7 @@ public sealed class TestSecretOperations : ISecretsOperations {
 
         private readonly ConcurrentDictionary<Guid, string> _secrets = new();
 
-        public Task<T?> GetSecretValue<T>(ISecret<T> data) {
+        public Task<T?> GetSecretValue<T>(ISecret<T> data) where T : class {
             switch (data) {
                 case SecretAddress<T> secretAddress:
                     var key = Guid.Parse(secretAddress.Url.Authority);