diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
index 4ca912a02f..7850ec98e8 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
@@ -164,7 +164,7 @@ class JobOutput extends Component {
 
   loadMoreRows({ startIndex, stopIndex }) {
     if (startIndex === 0 && stopIndex === 0) {
-      return;
+      return Promise.resolve(null);
     }
     const { job } = this.props;
 
diff --git a/awx/ui_next/src/screens/Job/JobOutput/shared/MenuControls.jsx b/awx/ui_next/src/screens/Job/JobOutput/shared/MenuControls.jsx
index 9391ccadc6..1e7e3ffdcf 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/shared/MenuControls.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/shared/MenuControls.jsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { Button as PFButton } from '@patternfly/react-core';
 import {
   PlusIcon,
@@ -22,38 +22,29 @@ const Button = styled(PFButton)`
   }
 `;
 
-class MenuControls extends Component {
-  constructor(props) {
-    super(props);
-  }
-
-  render() {
-    const {
-      onScrollTop,
-      onScrollBottom,
-      onScrollNext,
-      onScrollPrevious,
-    } = this.props;
-    return (
-      <Wrapper>
-        <Button variant="plain">
-          <PlusIcon />
-        </Button>
-        <Button onClick={onScrollPrevious} variant="plain">
-          <AngleUpIcon />
-        </Button>
-        <Button onClick={onScrollNext} variant="plain">
-          <AngleDownIcon />
-        </Button>
-        <Button onClick={onScrollTop} variant="plain">
-          <AngleDoubleUpIcon />
-        </Button>
-        <Button onClick={onScrollBottom} variant="plain">
-          <AngleDoubleDownIcon />
-        </Button>
-      </Wrapper>
-    );
-  }
-}
+const MenuControls = ({
+  onScrollTop,
+  onScrollBottom,
+  onScrollNext,
+  onScrollPrevious,
+}) => (
+  <Wrapper>
+    <Button variant="plain">
+      <PlusIcon />
+    </Button>
+    <Button onClick={onScrollPrevious} variant="plain">
+      <AngleUpIcon />
+    </Button>
+    <Button onClick={onScrollNext} variant="plain">
+      <AngleDownIcon />
+    </Button>
+    <Button onClick={onScrollTop} variant="plain">
+      <AngleDoubleUpIcon />
+    </Button>
+    <Button onClick={onScrollBottom} variant="plain">
+      <AngleDoubleDownIcon />
+    </Button>
+  </Wrapper>
+);
 
 export default MenuControls;