diff --git a/library/system/setup b/library/system/setup
index 107a3bd7121..1813c60ee9e 100755
--- a/library/system/setup
+++ b/library/system/setup
@@ -445,7 +445,7 @@ class Facts(object):
         self.facts['date_time']['minute'] = now.strftime('%M')
         self.facts['date_time']['second'] = now.strftime('%S')
         self.facts['date_time']['epoch'] = now.strftime('%s')
-        if self.facts['date_time']['epoch'][0] == '%':
+        if self.facts['date_time']['epoch'] == '' or self.facts['date_time']['epoch'][0] == '%':
             self.facts['date_time']['epoch'] = str(int(time.time()))
         self.facts['date_time']['date'] = now.strftime('%Y-%m-%d')
         self.facts['date_time']['time'] = now.strftime('%H:%M:%S')