diff --git a/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java b/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java
index 0a6b3570b24..3bffcd042a3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/SendFeedbackAPI.java
@@ -47,7 +47,8 @@ public Response submitFeedback(@Context ContainerRequestContext crc, String json
             }
 
             JsonNumber jsonNumber = jsonObject.containsKey("targetId") ? jsonObject.getJsonNumber("targetId") : null;
-            String idtf = jsonObject.containsKey("identifier") ? jsonObject.getString("identifier") : null;
+            // idtf will hold the "targetId" or the "identifier". If neither is set then this is a general feedback to support
+            String idtf = jsonNumber != null ? jsonNumber.toString() : jsonObject.containsKey("identifier") ? jsonObject.getString("identifier") : null;
             DvObject feedbackTarget = null;
 
             if (jsonNumber != null) {