diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index ce02036f..52fff9d6 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -46,7 +46,7 @@
 				<div class="vm-vmid">
 					<div class="vm-item-subtitle">{% trans "Current Pricing" %}</div>
 					<div class="vm-item-lg">{{order.price|floatformat:2|intcomma}} CHF/{% trans "Month" %}</div>
-					<a class="btn btn-vm-invoice" href="{% url 'hosting:orders' order.pk %}">{% trans "See Invoice" %}</a>
+					<a class="btn btn-vm-invoice" href="{% if has_invoices %}{% url 'hosting:invoices' %}{% else %}{% url 'hosting:orders' order.pk %}{% endif %}">{% trans "See Invoice" %}</a>
 				</div>
 			</div>
 			<div class="vm-detail-item">
diff --git a/hosting/views.py b/hosting/views.py
index da139f0b..fa2f177e 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -1570,8 +1570,21 @@ class VirtualMachineView(LoginRequiredMixin, View):
                 'virtual_machine': serializer.data,
                 'order': HostingOrder.objects.get(
                     vm_id=serializer.data['vm_id']
-                )
+                ),
+                'has_invoices': False
             }
+            try:
+                bills = []
+                if hasattr(self.request.user, 'stripecustomer'):
+                    bills = MonthlyHostingBill.objects.filter(
+                        customer=self.request.user.stripecustomer
+                    )
+                if len(bills) > 0:
+                    context['has_invoices'] = True
+            except MonthlyHostingBill.DoesNotExist as dne:
+                logger.error("{}'s monthly hosting bill not imported ?".format(
+                    self.request.user.email
+                ))
         except Exception as ex:
             logger.debug("Exception generated {}".format(str(ex)))
             messages.error(self.request,