         (let ((time (cdr (assq ?t fancy-battery-last-status))))
           (cond
            ((string= "0:00" time) "")
-           ((string= "N/A" time) "(calculating...)")
+           ((string= "N/A" time) "")
+           ((string-empty-p time) "")
            (t (concat " (" time ")")))))
 
       (setq-default fancy-battery-show-percentage t)

        (interactive)
        (if fancy-battery-mode
            (fancy-battery-mode -1)
          (fancy-battery-mode)))

      (defun spacemacs/mode-line-battery-percentage ()
        "Return the load percentage or an empty string."

      ;; basically remove all faces and properties.
      (defun fancy-battery-default-mode-line ()
        "Assemble a mode line string for Fancy Battery Mode."
        (spacemacs/mode-line-battery-remove-from-global)
        (when fancy-battery-last-status

          (let* ((type (cdr (assq ?L fancy-battery-last-status)))
                 (percentage (spacemacs/mode-line-battery-percentage))
                 (time (spacemacs/mode-line-battery-time)))
