diff --git a/app/models/token.rb b/app/models/token.rb
index 43142ce4..926b14ff 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -1,4 +1,12 @@
 class Token < ActiveRecord::Base
   enum standard: [:dip20, :icrc1, :unknown]
   validates :canister_id, presence: true, uniqueness: true
+
+  def transfer_fee_to_f
+    if self.transfer_fee.present?
+      return self.transfer_fee/(10.0**self.decimals)
+    else
+      return nil
+    end
+  end
 end
diff --git a/app/views/tokens/index.html.haml b/app/views/tokens/index.html.haml
index c4c371d1..9afa16aa 100644
--- a/app/views/tokens/index.html.haml
+++ b/app/views/tokens/index.html.haml
@@ -34,7 +34,7 @@
             %td= token.name
             %td= token.total_supply
             %td= token.decimals
-            %td= token.transfer_fee
+            %td= token.transfer_fee_to_f
             - if policy(token).update?
               %td= link_to 'Show', token
               %td= link_to 'Edit', edit_token_path(token)
diff --git a/app/views/tokens/show.html.haml b/app/views/tokens/show.html.haml
index d645479a..e26f9f83 100644
--- a/app/views/tokens/show.html.haml
+++ b/app/views/tokens/show.html.haml
@@ -31,7 +31,5 @@
   = @token.decimals
 %p
   %b Transfer fee:
-  - begin
-    = @token.transfer_fee/(10.0**@token.decimals)
-  - rescue
+  = @token.transfer_fee_to_f