diff --git a/components/common/FeedbackForm.js b/components/common/FeedbackForm.js
index ad1c52fd..a0a4185d 100644
--- a/components/common/FeedbackForm.js
+++ b/components/common/FeedbackForm.js
@@ -58,7 +58,12 @@ const FeedbackForm = ({
 
   const t = useTranslations();
   const [sent, setSent] = useState(false);
-  const onDismiss = () => setSent(false);
+  const [formEmptyError, setFormEmptyError] = useState(false);
+  const onDismiss = () => {
+    setSent(false);
+    setFormEmptyError(false);
+  };
+
   const pathname = usePathname();
   const searchParams = useSearchParams();
 
@@ -70,6 +75,26 @@ const FeedbackForm = ({
   const onSubmit = (formData) => {
     const { name, email, comment, ...additionalResponse } = formData;
 
+    const isCommentEmpty = !comment || comment.trim() === '';
+    const areAllAdditionalFieldsEmpty = Object.values(additionalResponse).every(
+      (value) => {
+        if (Array.isArray(value)) {
+          return value.length === 0;
+        }
+        return value === '' || value === null || value === undefined;
+      }
+    );
+
+    const isFormEffectivelyEmpty =
+      feedbackSetting !== 'required' &&
+      isCommentEmpty &&
+      areAllAdditionalFieldsEmpty;
+
+    if (isFormEffectivelyEmpty) {
+      setFormEmptyError(true);
+      return;
+    }
+
     const data = {
       name,
       email: emailSetting !== 'excluded' ? email : undefined,
@@ -85,6 +110,7 @@ const FeedbackForm = ({
       ),
     };
     setSent(true);
+    setFormEmptyError(false);
     createUserFeedback({ variables: { input: data } });
   };
   const renderAdditionalField = (field) => {
@@ -292,6 +318,16 @@ const FeedbackForm = ({
                 <p>{t('feedback-error-content')}</p>
               </Alert>
             )}
+            {formEmptyError && (
+              <Alert
+                color="danger"
+                className="mt-3"
+                isOpen={formEmptyError}
+                toggle={onDismiss}
+              >
+                {t('form-effectively-empty-error')}
+              </Alert>
+            )}
             <Button type="submit" color="primary">
               {!mutationLoading && t('send')}
               {mutationLoading && (
diff --git a/locales/en/common.json b/locales/en/common.json
index c63829d5..3a9982a3 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1,179 +1,180 @@
 {
-    "accessibility": "Accessibility",
-    "action": "{context, select, CASE_STUDY {Case study} STRATEGY {Strategy} other {Action}}",
-    "actions": "{context, select, CASE_STUDY {Case studies} STRATEGY {Strategies} other {Actions}}",
-    "actions-as-list": "As a list",
-    "active-filters": "Active filters",
-    "admin-login": "Admin login",
-    "back-to-top": "Back to top",
-    "bar-goal": "Goal",
-    "close": "Close",
-    "contact": "Contact",
-    "contact-info": "Contact information",
-    "contact-person-main": "Main contact person",
-    "contact-persons": "Contact persons",
-    "contact-persons-missing": "No named contact persons",
-    "copied-to-clipboard": "Copied!",
-    "copy-to-clipboard": "Copy link to clipboard",
-    "current-trend": "trend",
-    "dashboard": "Dashboard",
-    "default-sorting": "Default sorting",
-    "email": "E-mail",
-    "error": "Error",
-    "error-email-format": "Please provide a valid email address",
-    "error-feedback-required": "Feedback is required",
-    "error-loading-actions": "{context, select, CASE_STUDY {Error loading the case studies list} STRATEGY {Error loading the strategies list} other {Error loading the actions list}}",
-    "error-loading-indicators": "Error loading the indicators list",
-    "error-occurred": "Error occurred",
-    "error-with-code": "Error with code",
-    "export": "Export",
-    "feedback": "Feedback",
-    "feedback-description": "Did you discover something that does not work? Or do you have ideas on something we can improve?",
-    "feedback-error-content": "Something went wrong and your feedback was not received. Please try again in a moment.",
-    "feedback-error-header": "Error sending the message",
-    "feedback-prompt": "Please let us know by filling and sending this form.",
-    "feedback-thankyou-content": "Thank you for taking the time to provide us feedback. It's truly helpful.",
-    "feedback-thankyou-header": "Feedback received",
-    "filter-all-categories": "All",
-    "filter-all-impacts": "All impacts",
-    "filter-all-organizations": "{context, select, DIVISION {All divisions} other {All organizations}}",
-    "filter-all-phases": "All phases",
-    "filter-all-plans": "All plans",
-    "filter-all-statuses": "All statuses",
-    "filter-all-schedules": "All schedules",
-    "filter-impact": "Impact",
-    "filter-organization": "{context, select, DIVISION {Division} other {Organization}}",
-    "filter-phase": "Phase",
-    "filter-plan": "Plan",
-    "filter-primary-organization": "{context, select, DIVISION {Lead division} other {Primary organization}}",
-    "filter-result-actions": "{context, select, CASE_STUDY {case studies} STRATEGY {strategies} other {actions}}",
-    "filter-schedule": "Schedule",
-    "filter-status": "Status",
-    "filter-text": "{context, select, STRATEGY {Search strategies} CASE_STUDY {Search case studies} other {Search actions}}",
-    "filter-text-default": "Search by keyword",
-    "front-page": "Front Page",
-    "give-feedback": "Give feedback",
-    "goal": "goal",
-    "image-credit": "Image",
-    "indicator-affected-by": "This indicator is affected by",
-    "indicator-also-for-actions": "Also impacted by",
-    "indicator-goal": "Goal",
-    "indicator-has-effect-on": "This indicator has effect on",
-    "indicator-latest-value": "Latest value",
-    "indicator-no-values": "No values",
-    "indicator-not-found": "Indicator not found",
-    "indicator-population-normalized-value": "Per capita",
-    "indicator-related-actions": "{context, select, CASE_STUDY {Case studies that impact this indicator} STRATEGY {Strategies that impact this indicator} other {Actions that impact this indicator}}",
-    "indicator-resolution-years": "years",
-    "indicator-time-no-goals": "No goals",
-    "indicator-time-to-goal": "Time to goal",
-    "indicator-goal-exceeded": "Goal already exceeded",
-    "indicator-value": "Value",
-    "indicator": "Indicator",
-    "indicators": "Indicators",
-    "indicators-as-insight": "As insights",
-    "indicators-as-list": "As a list",
-    "insight-download-label": "Download",
-    "insight-download-png": "Image (png)",
-    "insight-filter-label": "Filter by indicator",
-    "insight-filter-no-results": "No results",
-    "instance-type-development-label": "Development",
-    "instance-type-development-message": "This is a development version of the service",
-    "instance-type-staging-label": "Staging",
-    "instance-type-staging-message": "This is a staging version of the service",
-    "instance-type-testing-label": "Testing",
-    "instance-type-testing-message": "This is a test version of the service",
-    "loading": "Loading",
-    "municipality": "Municipality",
-    "name": "Name",
-    "nav-menu-close": "Close menu",
-    "nav-menu-open": "Navigation menu",
-    "next": "Next",
-    "no-actions": "No actions",
-    "number-of-search-results": "{count, plural, =1 {one hit} other {# hits}} for search",
-    "open": "open",
-    "operational-indicator": "Operational indicator",
-    "other-plans-only": "Search only across other cities' plans",
-    "over-relative-time": "Over {relativeTime}",
-    "page": "Page",
-    "page-not-found": "Page not found",
-    "percent-point-abbreviation": "p.p.",
-    "previous": "Previous",
-    "published-on": "Published on",
-    "read-more": "Read more",
-    "recently-updated-actions": "{context, select, CASE_STUDY {Recently updated case studies} STRATEGY {Recently updated strategies} other {Recently updated actions}}",
-    "recently-updated-indicators": "Recently updated indicators",
-    "reduced": "Reduced",
-    "reference": "Reference",
-    "remove-filter": "Remove filter",
-    "required-field": "Required field",
-    "responsible-parties": "{context, select, DIVISION {Responsible divisions} other {Responsible organizations}}",
-    "responsible-party-main": "Main responsible",
-    "search": "Search",
-    "search-from-plans": "Search from plans",
-    "see-all-actions": "{context, select, CASE_STUDY {See all case studies} STRATEGY {See all strategies} other {See all actions}}",
-    "see-all-indicators": "See all indicators",
-    "see-all-results": "See all {count} results",
-    "searching-for": "Searching for \"{term}\"",
-    "search-advanced": "Advanced search",
-    "search-no-results": "No results for this search. Try changing the search terms.",
-    "send": "Send",
-    "skip-to-content": "Skip to main content",
-    "strategic-indicator": "Strategic indicator",
-    "supported-by": "Supported by",
-    "tactical-indicator": "Tactical indicator",
-    "themes": "Themes",
-    "to-reduce": "Left to reduce",
-    "total": "total",
-    "type": "Type",
-    "under-relative-time": "Under {relativeTime}",
-    "updated": "Updated",
-    "primary-organization": "{context, select, DIVISION {Division} other {Organization}}",
-    "with-contact-persons": "Have contact person",
-    "without-contact-person": "No contact person",
-    "has-goals": "Has goals",
-    "latest-update": "Latest update",
-    "return-to-front": "Return to front page",
-    "admin-login-not-defined": "Admin login page has not been defined",
-    "organizations": "{context, select, DIVISION {Divisions} other {Organizations}}",
-    "indicator-compare-source": "Showing",
-    "indicator-compare-to": "Compare to",
-    "indicator-normalize-per-capita": "Show per capita",
-    "indicator-progress-bar": "On the year {startYear} {name} was {startValue}. Latest observed value in {latestYear} was {latestValue}. The goal for the year {goalYear} is {goalValue}. Since {startYear} reduction is {reduced}. {toBeReduced} still needs to be reduced before the year {goalYear}.",
-    "nav-actions-pager": "Actions pager",
-    "form-action-filters": "Action list filters",
-    "nav-tools": "Tools",
-    "nav-primary": "Primary",
-    "nav-footer": "Footer",
-    "common-of-all-emissions": "of all emissions",
-    "filter-impact-help": "Show actions with selected impact",
-    "filter-organization-help": "{context, select, DIVISION {Show actions that the selected division is responsible for} other {Show actions that the selected organization is responsible for}}",
-    "filter-phase-help": "Show actions in selected implementation phase",
-    "filter-plan-help": "Show actions in selected plan",
-    "filter-primary-organization-help": "{context, select, DIVISION {Show actions of selected division} other {Show actions of selected municipality}}",
-    "filter-schedule-help": "Show actions spanning across selected schedule",
-    "filter-status-help": "Show actions with selected status",
-    "additional-filters": "Additional filters",
-    "actions-filter-by": "Filter",
-    "version-this-is-old": "This is an old version",
-    "version-switch-to-active": "Latest version",
-    "versions-list": "All versions",
-    "version-history": "Version history",
-    "report": "Report",
-    "navigation-home": "Home",
-    "graph-hideTable": "Hide table",
-    "graph-showTable": "Show data table",
-    "definition": "Definition",
-    "no-reports": "No reports are available.",
-    "no-action-data-for-report": "The report contains no data for this action.",
-    "select-sector-for-actions": "Select an emission sector to view related actions",
-    "no-phase": "No phase set",
-    "no-status": "No status set",
-    "collapse-row": "Collapse row",
-    "expand-row": "Expand row",
-    "ui-sign-in": "Sign in",
-    "ui-sign-out": "Sign out",
-    "action-versions": "Action versions",
-    "content-could-not-be-displayed": "We're unable to display this content at the moment. Please try refreshing the page. A report has been sent to our team to investigate the issue.",
-    "select-language": "Select language"
+  "accessibility": "Accessibility",
+  "action": "{context, select, CASE_STUDY {Case study} STRATEGY {Strategy} other {Action}}",
+  "actions": "{context, select, CASE_STUDY {Case studies} STRATEGY {Strategies} other {Actions}}",
+  "actions-as-list": "As a list",
+  "active-filters": "Active filters",
+  "admin-login": "Admin login",
+  "back-to-top": "Back to top",
+  "bar-goal": "Goal",
+  "close": "Close",
+  "contact": "Contact",
+  "contact-info": "Contact information",
+  "contact-person-main": "Main contact person",
+  "contact-persons": "Contact persons",
+  "contact-persons-missing": "No named contact persons",
+  "copied-to-clipboard": "Copied!",
+  "copy-to-clipboard": "Copy link to clipboard",
+  "current-trend": "trend",
+  "dashboard": "Dashboard",
+  "default-sorting": "Default sorting",
+  "email": "E-mail",
+  "error": "Error",
+  "error-email-format": "Please provide a valid email address",
+  "error-feedback-required": "Feedback is required",
+  "error-loading-actions": "{context, select, CASE_STUDY {Error loading the case studies list} STRATEGY {Error loading the strategies list} other {Error loading the actions list}}",
+  "error-loading-indicators": "Error loading the indicators list",
+  "error-occurred": "Error occurred",
+  "error-with-code": "Error with code",
+  "export": "Export",
+  "feedback": "Feedback",
+  "feedback-description": "Did you discover something that does not work? Or do you have ideas on something we can improve?",
+  "feedback-error-content": "Something went wrong and your feedback was not received. Please try again in a moment.",
+  "feedback-error-header": "Error sending the message",
+  "feedback-prompt": "Please let us know by filling and sending this form.",
+  "feedback-thankyou-content": "Thank you for taking the time to provide us feedback. It's truly helpful.",
+  "feedback-thankyou-header": "Feedback received",
+  "filter-all-categories": "All",
+  "filter-all-impacts": "All impacts",
+  "filter-all-organizations": "{context, select, DIVISION {All divisions} other {All organizations}}",
+  "filter-all-phases": "All phases",
+  "filter-all-plans": "All plans",
+  "filter-all-statuses": "All statuses",
+  "filter-all-schedules": "All schedules",
+  "filter-impact": "Impact",
+  "filter-organization": "{context, select, DIVISION {Division} other {Organization}}",
+  "filter-phase": "Phase",
+  "filter-plan": "Plan",
+  "filter-primary-organization": "{context, select, DIVISION {Lead division} other {Primary organization}}",
+  "filter-result-actions": "{context, select, CASE_STUDY {case studies} STRATEGY {strategies} other {actions}}",
+  "filter-schedule": "Schedule",
+  "filter-status": "Status",
+  "filter-text": "{context, select, STRATEGY {Search strategies} CASE_STUDY {Search case studies} other {Search actions}}",
+  "filter-text-default": "Search by keyword",
+  "front-page": "Front Page",
+  "give-feedback": "Give feedback",
+  "goal": "goal",
+  "image-credit": "Image",
+  "indicator-affected-by": "This indicator is affected by",
+  "indicator-also-for-actions": "Also impacted by",
+  "indicator-goal": "Goal",
+  "indicator-has-effect-on": "This indicator has effect on",
+  "indicator-latest-value": "Latest value",
+  "indicator-no-values": "No values",
+  "indicator-not-found": "Indicator not found",
+  "indicator-population-normalized-value": "Per capita",
+  "indicator-related-actions": "{context, select, CASE_STUDY {Case studies that impact this indicator} STRATEGY {Strategies that impact this indicator} other {Actions that impact this indicator}}",
+  "indicator-resolution-years": "years",
+  "indicator-time-no-goals": "No goals",
+  "indicator-time-to-goal": "Time to goal",
+  "indicator-goal-exceeded": "Goal already exceeded",
+  "indicator-value": "Value",
+  "indicator": "Indicator",
+  "indicators": "Indicators",
+  "indicators-as-insight": "As insights",
+  "indicators-as-list": "As a list",
+  "insight-download-label": "Download",
+  "insight-download-png": "Image (png)",
+  "insight-filter-label": "Filter by indicator",
+  "insight-filter-no-results": "No results",
+  "instance-type-development-label": "Development",
+  "instance-type-development-message": "This is a development version of the service",
+  "instance-type-staging-label": "Staging",
+  "instance-type-staging-message": "This is a staging version of the service",
+  "instance-type-testing-label": "Testing",
+  "instance-type-testing-message": "This is a test version of the service",
+  "loading": "Loading",
+  "municipality": "Municipality",
+  "name": "Name",
+  "nav-menu-close": "Close menu",
+  "nav-menu-open": "Navigation menu",
+  "next": "Next",
+  "no-actions": "No actions",
+  "number-of-search-results": "{count, plural, =1 {one hit} other {# hits}} for search",
+  "open": "open",
+  "operational-indicator": "Operational indicator",
+  "other-plans-only": "Search only across other cities' plans",
+  "over-relative-time": "Over {relativeTime}",
+  "page": "Page",
+  "page-not-found": "Page not found",
+  "percent-point-abbreviation": "p.p.",
+  "previous": "Previous",
+  "published-on": "Published on",
+  "read-more": "Read more",
+  "recently-updated-actions": "{context, select, CASE_STUDY {Recently updated case studies} STRATEGY {Recently updated strategies} other {Recently updated actions}}",
+  "recently-updated-indicators": "Recently updated indicators",
+  "reduced": "Reduced",
+  "reference": "Reference",
+  "remove-filter": "Remove filter",
+  "required-field": "Required field",
+  "responsible-parties": "{context, select, DIVISION {Responsible divisions} other {Responsible organizations}}",
+  "responsible-party-main": "Main responsible",
+  "search": "Search",
+  "search-from-plans": "Search from plans",
+  "see-all-actions": "{context, select, CASE_STUDY {See all case studies} STRATEGY {See all strategies} other {See all actions}}",
+  "see-all-indicators": "See all indicators",
+  "see-all-results": "See all {count} results",
+  "searching-for": "Searching for \"{term}\"",
+  "search-advanced": "Advanced search",
+  "search-no-results": "No results for this search. Try changing the search terms.",
+  "send": "Send",
+  "skip-to-content": "Skip to main content",
+  "strategic-indicator": "Strategic indicator",
+  "supported-by": "Supported by",
+  "tactical-indicator": "Tactical indicator",
+  "themes": "Themes",
+  "to-reduce": "Left to reduce",
+  "total": "total",
+  "type": "Type",
+  "under-relative-time": "Under {relativeTime}",
+  "updated": "Updated",
+  "primary-organization": "{context, select, DIVISION {Division} other {Organization}}",
+  "with-contact-persons": "Have contact person",
+  "without-contact-person": "No contact person",
+  "has-goals": "Has goals",
+  "latest-update": "Latest update",
+  "return-to-front": "Return to front page",
+  "admin-login-not-defined": "Admin login page has not been defined",
+  "organizations": "{context, select, DIVISION {Divisions} other {Organizations}}",
+  "indicator-compare-source": "Showing",
+  "indicator-compare-to": "Compare to",
+  "indicator-normalize-per-capita": "Show per capita",
+  "indicator-progress-bar": "On the year {startYear} {name} was {startValue}. Latest observed value in {latestYear} was {latestValue}. The goal for the year {goalYear} is {goalValue}. Since {startYear} reduction is {reduced}. {toBeReduced} still needs to be reduced before the year {goalYear}.",
+  "nav-actions-pager": "Actions pager",
+  "form-action-filters": "Action list filters",
+  "nav-tools": "Tools",
+  "nav-primary": "Primary",
+  "nav-footer": "Footer",
+  "common-of-all-emissions": "of all emissions",
+  "filter-impact-help": "Show actions with selected impact",
+  "filter-organization-help": "{context, select, DIVISION {Show actions that the selected division is responsible for} other {Show actions that the selected organization is responsible for}}",
+  "filter-phase-help": "Show actions in selected implementation phase",
+  "filter-plan-help": "Show actions in selected plan",
+  "filter-primary-organization-help": "{context, select, DIVISION {Show actions of selected division} other {Show actions of selected municipality}}",
+  "filter-schedule-help": "Show actions spanning across selected schedule",
+  "filter-status-help": "Show actions with selected status",
+  "additional-filters": "Additional filters",
+  "actions-filter-by": "Filter",
+  "version-this-is-old": "This is an old version",
+  "version-switch-to-active": "Latest version",
+  "versions-list": "All versions",
+  "version-history": "Version history",
+  "report": "Report",
+  "navigation-home": "Home",
+  "graph-hideTable": "Hide table",
+  "graph-showTable": "Show data table",
+  "definition": "Definition",
+  "no-reports": "No reports are available.",
+  "no-action-data-for-report": "The report contains no data for this action.",
+  "select-sector-for-actions": "Select an emission sector to view related actions",
+  "no-phase": "No phase set",
+  "no-status": "No status set",
+  "collapse-row": "Collapse row",
+  "expand-row": "Expand row",
+  "ui-sign-in": "Sign in",
+  "ui-sign-out": "Sign out",
+  "action-versions": "Action versions",
+  "content-could-not-be-displayed": "We're unable to display this content at the moment. Please try refreshing the page. A report has been sent to our team to investigate the issue.",
+  "select-language": "Select language",
+  "form-effectively-empty-error": "Your feedback is empty. Please fill in at least one field."
 }