diff --git a/parts/1/uniCafe/src/App.jsx b/parts/1/uniCafe/src/App.jsx
index 1ab4c6b..7155b64 100644
--- a/parts/1/uniCafe/src/App.jsx
+++ b/parts/1/uniCafe/src/App.jsx
@@ -32,6 +32,39 @@ const App = () => {
     return good / computeTotalCount();
   };
 
+  const isThereAnyFeedback = () => {
+    return computeTotalCount() !== 0;
+  };
+
+  let feedbackSection;
+  if (isThereAnyFeedback()) {
+    feedbackSection = (
+      <>
+        <StatisticDisplay statisticName="good" statisticValue={good} />
+        <StatisticDisplay statisticName="neutral" statisticValue={neutral} />
+        <StatisticDisplay statisticName="bad" statisticValue={bad} />
+        <StatisticDisplay
+          statisticName="count"
+          statisticValue={computeTotalCount()}
+        />
+        <StatisticDisplay
+          statisticName="average"
+          statisticValue={computeAverage()}
+        />
+        <StatisticDisplay
+          statisticName="positive"
+          statisticValue={computePercentagePositive() * 100 + "%"}
+        />
+      </>
+    );
+  } else {
+    feedbackSection = (
+      <>
+        <p>No feedback given.</p>
+      </>
+    );
+  }
+
   return (
     <div>
       <Header headerText="give feedback" />
@@ -54,21 +87,7 @@ const App = () => {
         buttonText="bad"
       />
       <Header headerText="statistics" />
-      <StatisticDisplay statisticName="good" statisticValue={good} />
-      <StatisticDisplay statisticName="neutral" statisticValue={neutral} />
-      <StatisticDisplay statisticName="bad" statisticValue={bad} />
-      <StatisticDisplay
-        statisticName="count"
-        statisticValue={computeTotalCount()}
-      />
-      <StatisticDisplay
-        statisticName="average"
-        statisticValue={computeAverage()}
-      />
-      <StatisticDisplay
-        statisticName="positive"
-        statisticValue={computePercentagePositive() * 100 + "%"}
-      />
+      {feedbackSection}
     </div>
   );
   // Buttons