diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
index 9937084eb..734704f05 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
@@ -89,7 +89,7 @@ public interface TenantConfigurationManagement {
      */
     @PreAuthorize(value = SpringEvalExpressions.HAS_AUTH_TENANT_CONFIGURATION + SpringEvalExpressions.HAS_AUTH_OR
             + SpringEvalExpressions.IS_SYSTEM_CODE)
-    TenantConfigurationValue<?> getConfigurationValue(TenantConfigurationKey configurationKey);
+    <T> TenantConfigurationValue<T> getConfigurationValue(TenantConfigurationKey configurationKey);
 
     /**
      * Retrieves a configuration value from the e.g. tenant overwritten