diff --git a/beer/beer.py b/beer/beer.py
index a7ddf54..4e1ea19 100755
--- a/beer/beer.py
+++ b/beer/beer.py
@@ -17,8 +17,10 @@ def index(hours=None, minutes=None):
     """ main and only app """
     if not hours:
         hours = 17
-    if not minutes:
+    if hours and not minutes:
         minutes = 30
+    else:
+        minutes = 0
 
     data = render_template('beer.html', hours=hours, minutes=minutes)
     return data