diff --git a/js/components/MiniTime.js b/js/components/MiniTime.tsx
similarity index 66%
rename from js/components/MiniTime.js
rename to js/components/MiniTime.tsx
index 6850b1f8..9c746b16 100644
--- a/js/components/MiniTime.js
+++ b/js/components/MiniTime.tsx
@@ -1,3 +1,4 @@
+import { AppState, Action } from "../types";
 import React from "react";
 import { connect } from "react-redux";
 import classnames from "classnames";
@@ -12,21 +13,32 @@ import "../../css/mini-time.css";
 // alternate between the actual character and the space character. Not
 // Possible to do that in pure CSS with the background being dynamically generated.
 // All "space" characters is also how Winamp renders no content.
-const Background = () =>
-  [1, 7, 12, 20, 25].map((left, i) => (
-    <Character
-      style={{ left }}
-      key={i}
-      className="background-character"
-      children=" "
-    />
-  ));
+const Background = () => (
+  <React.Fragment>
+    {[1, 7, 12, 20, 25].map((left, i) => (
+      <Character
+        style={{ left }}
+        key={i}
+        className="background-character"
+        children=" "
+      />
+    ))}
+  </React.Fragment>
+);
 
-const MiniTime = props => {
+type StateProps = {
+  status: string | null;
+  timeMode: string;
+  timeElapsed: number;
+  length: number | null;
+  toggle: () => void;
+};
+
+const MiniTime = (props: StateProps) => {
   let seconds = null;
   // TODO: Clean this up: If stopped, just render the background, rather than
   // rendering spaces twice.
-  if (props.status !== MEDIA_STATUS.STOPPED) {
+  if (props.status !== MEDIA_STATUS.STOPPED && props.length != null) {
     seconds =
       props.timeMode === TIME_MODE.ELAPSED
         ? props.timeElapsed
@@ -54,12 +66,21 @@ const MiniTime = props => {
   );
 };
 
-const mapDispatchToProps = {
+const mapStateToProps = (state: AppState) => ({
+  status: state.media.status,
+  timeMode: state.media.timeMode,
+  timeElapsed: state.media.timeElapsed,
+  length: state.media.length
+});
+
+const mapDispatchToProps = (dispatch: (action: Action) => void) => ({
   // TODO: move to actionCreators
-  toggle: () => ({ type: TOGGLE_TIME_MODE })
-};
+  toggle: () => {
+    dispatch({ type: TOGGLE_TIME_MODE });
+  }
+});
 
 export default connect(
-  state => state.media,
+  mapStateToProps,
   mapDispatchToProps
 )(MiniTime);
diff --git a/js/utils.ts b/js/utils.ts
index 03269d81..328cec0b 100644
--- a/js/utils.ts
+++ b/js/utils.ts
@@ -13,7 +13,7 @@ interface IniData {
   };
 }
 
-export const getTimeObj = (time: number): Time => {
+export const getTimeObj = (time: number | null): Time => {
   if (time == null) {
     // If we clean up `<MiniTime />` we don't need to do this any more.
     return {