diff --git a/cachier/core.py b/cachier/core.py
index b1d8cb1..df7fca5 100644
--- a/cachier/core.py
+++ b/cachier/core.py
@@ -479,7 +479,7 @@ def cachier(stale_after=None, next_time=False, pickle_reload=True,
                                 core.mark_entry_not_calculated(key)
                     # print('And it is fresh!')
                     return entry['value']
-                if entry['being_calculated']:
+                if entry['being_calculated'] and wait_calc:
                     # print('No value but already being calculated. Waiting.')
                     return core.wait_on_entry_calc(key)
             # core.mark_entry_being_calculated(key)