diff --git a/app/apps/currencies/utils/convert.py b/app/apps/currencies/utils/convert.py
index caa2a94..cc22cd2 100644
--- a/app/apps/currencies/utils/convert.py
+++ b/app/apps/currencies/utils/convert.py
@@ -43,12 +43,10 @@ def get_exchange_rate(
 
 def convert(amount, from_currency: Currency, to_currency: Currency, date=None):
     if from_currency == to_currency:
-        return (
-            amount,
-            to_currency.prefix,
-            to_currency.suffix,
-            to_currency.decimal_places,
-        )
+        return None, None, None, None
+
+    if amount == 0:
+        return None, None, None, None
 
     if date is None:
         date = timezone.localtime(timezone.now())
diff --git a/app/templates/net_worth/net_worth.html b/app/templates/net_worth/net_worth.html
index 1b1c85e..0254261 100644
--- a/app/templates/net_worth/net_worth.html
+++ b/app/templates/net_worth/net_worth.html
@@ -37,7 +37,7 @@
                       </div>
                   </div>
               </div>
-              {% if currency.exchanged %}
+              {% if currency.exchanged and currency.exchanged.amount %}
               <div>
                 <c-amount.display
                           :amount="currency.exchanged.amount"
diff --git a/app/templates/yearly_overview/fragments/currency_data.html b/app/templates/yearly_overview/fragments/currency_data.html
index fde1da7..95fcfbf 100644
--- a/app/templates/yearly_overview/fragments/currency_data.html
+++ b/app/templates/yearly_overview/fragments/currency_data.html
@@ -15,7 +15,7 @@
               :suffix="entry.suffix"
               :decimal_places="entry.decimal_places"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -44,7 +44,7 @@
               :suffix="entry.suffix"
               :decimal_places="entry.decimal_places"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -74,7 +74,7 @@
               :decimal_places="entry.decimal_places"
               color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -104,7 +104,7 @@
             :suffix="entry.suffix"
             :decimal_places="entry.decimal_places"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -133,7 +133,7 @@
               :suffix="entry.suffix"
               :decimal_places="entry.decimal_places"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -163,7 +163,7 @@
               :decimal_places="entry.decimal_places"
               color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"
@@ -194,7 +194,7 @@
               :decimal_places="entry.decimal_places"
               color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
         </div>
-        {% if entry.exchanged %}
+        {% if entry.exchanged and entry.exchanged.amount %}
         <div>
           <c-amount.display
             :amount="entry.exchanged.amount"