diff --git a/src/components/BarChart/BarChart.jsx b/src/components/BarChart/BarChart.jsx
index e575d8243..70d4e3a07 100644
--- a/src/components/BarChart/BarChart.jsx
+++ b/src/components/BarChart/BarChart.jsx
@@ -324,11 +324,9 @@ const BarChart = createClass({
 			: yAxisFinalFormatter;
 
 		if (_.isEmpty(data) || width < 1 || height < 1 || isLoading) {
-			const emptyStateWrapper = getFirst(
-				this.props,
-				BarChart.EmptyStateWrapper,
-				<BarChart.EmptyStateWrapper Title="You have no data." />
-			);
+			const emptyStateWrapper =
+				getFirst(this.props, BarChart.EmptyStateWrapper) ||
+				<BarChart.EmptyStateWrapper Title="You have no data." />;
 
 			return (
 				<EmptyStateWrapper
diff --git a/src/components/DataTable/DataTable.jsx b/src/components/DataTable/DataTable.jsx
index 928a6a2df..c347119ad 100644
--- a/src/components/DataTable/DataTable.jsx
+++ b/src/components/DataTable/DataTable.jsx
@@ -245,14 +245,12 @@ const DataTable = createClass({
 				childComponentElement.type === DataTable.ColumnGroup
 		);
 
-		const emptyStateWrapper = getFirst(
-			this.props,
-			DataTable.EmptyStateWrapper,
+		const emptyStateWrapper =
+			getFirst(this.props, DataTable.EmptyStateWrapper) ||
 			<DataTable.EmptyStateWrapper
 				Title="No items found."
 				Body="Try creating a new object or removing a filter."
-			/>
-		);
+			/>;
 
 		const fillerRowCount = _.clamp(minRows - _.size(data), 0, Infinity);
 
diff --git a/src/components/DateSelect/DateSelect.jsx b/src/components/DateSelect/DateSelect.jsx
index a74cbc508..c2e596a83 100644
--- a/src/components/DateSelect/DateSelect.jsx
+++ b/src/components/DateSelect/DateSelect.jsx
@@ -290,11 +290,9 @@ const DateSelect = createClass({
 		const { cursor } = this.state;
 		const isRangeSameDay = DateUtils.isSameDay(from, to);
 
-		const calendarMonth = getFirst(
-			this.props,
-			DateSelect.CalendarMonth,
-			<DateSelect.CalendarMonth />
-		);
+		const calendarMonth =
+			getFirst(this.props, DateSelect.CalendarMonth) ||
+			<DateSelect.CalendarMonth />;
 		const monthsShown = clampMonthsShown(monthsShownRaw);
 
 		/* istanbul ignore next */
diff --git a/src/components/InfiniteSlidePanel/InfiniteSlidePanel.jsx b/src/components/InfiniteSlidePanel/InfiniteSlidePanel.jsx
index 4a5da178a..a7014a408 100644
--- a/src/components/InfiniteSlidePanel/InfiniteSlidePanel.jsx
+++ b/src/components/InfiniteSlidePanel/InfiniteSlidePanel.jsx
@@ -90,11 +90,9 @@ const InfiniteSlidePanel = createClass({
 			...passThroughs
 		} = this.props;
 
-		const slide = getFirst(
-			this.props,
-			InfiniteSlidePanel.Slide,
-			<InfiniteSlidePanel.Slide>{children}</InfiniteSlidePanel.Slide>
-		);
+		const slide =
+			getFirst(this.props, InfiniteSlidePanel.Slide) ||
+			<InfiniteSlidePanel.Slide>{children}</InfiniteSlidePanel.Slide>;
 		const slideChildRenderFunction = slide.props.children;
 		if (!_.isFunction(slideChildRenderFunction)) {
 			throw new Error(
diff --git a/src/components/LineChart/LineChart.jsx b/src/components/LineChart/LineChart.jsx
index f1e796de3..ff0f8cfba 100644
--- a/src/components/LineChart/LineChart.jsx
+++ b/src/components/LineChart/LineChart.jsx
@@ -492,11 +492,9 @@ const LineChart = createClass({
 		const xPoints = _.map(_.keys(xPointMap), _.toNumber);
 
 		if (_.isEmpty(data) || width < 1 || height < 1 || isLoading) {
-			const emptyStateWrapper = getFirst(
-				this.props,
-				LineChart.EmptyStateWrapper,
-				<LineChart.EmptyStateWrapper Title="You have no data." />
-			);
+			const emptyStateWrapper =
+				getFirst(this.props, LineChart.EmptyStateWrapper) ||
+				<LineChart.EmptyStateWrapper Title="You have no data." />;
 
 			return (
 				<EmptyStateWrapper
diff --git a/src/components/LoadingIndicator/LoadingIndicator.jsx b/src/components/LoadingIndicator/LoadingIndicator.jsx
index d7da69223..aa315cff5 100644
--- a/src/components/LoadingIndicator/LoadingIndicator.jsx
+++ b/src/components/LoadingIndicator/LoadingIndicator.jsx
@@ -61,7 +61,8 @@ const LoadingIndicator = createClass({
 
 		const { LoadingMessage } = LoadingIndicator;
 
-		const messageElement = getFirst(props, LoadingMessage, <LoadingMessage />);
+		const messageElement =
+			getFirst(props, LoadingMessage) || <LoadingMessage />;
 		const otherChildren = rejectTypes(children, LoadingMessage);
 
 		return (
diff --git a/src/components/SearchField/SearchField.jsx b/src/components/SearchField/SearchField.jsx
index 803374d72..82fb722a5 100644
--- a/src/components/SearchField/SearchField.jsx
+++ b/src/components/SearchField/SearchField.jsx
@@ -137,11 +137,8 @@ const SearchField = createClass({
 			value,
 		};
 
-		const textFieldElement = getFirst(
-			props,
-			TextField,
-			<TextField {...textFieldProps} />
-		);
+		const textFieldElement =
+			getFirst(props, TextField) || <TextField {...textFieldProps} />;
 		const isIconActive = _.isUndefined(isValid)
 			? !_.isEmpty(_.get(textFieldElement, 'props.value'))
 			: isValid;
diff --git a/src/components/SearchableMultiSelect/SearchableMultiSelect.jsx b/src/components/SearchableMultiSelect/SearchableMultiSelect.jsx
index 330cc1f0d..c2ec14af9 100644
--- a/src/components/SearchableMultiSelect/SearchableMultiSelect.jsx
+++ b/src/components/SearchableMultiSelect/SearchableMultiSelect.jsx
@@ -485,13 +485,11 @@ const SearchableMultiSelect = createClass({
 			'props',
 			{}
 		);
-		const selectionLabel = getFirst(
-			props,
-			SearchableMultiSelect.SelectionLabel,
+		const selectionLabel =
+			getFirst(props, SearchableMultiSelect.SelectionLabel) ||
 			<SearchableMultiSelect.SelectionLabel>
 				Selected
-			</SearchableMultiSelect.SelectionLabel>
-		);
+			</SearchableMultiSelect.SelectionLabel>;
 		const isSmall = responsiveMode === 'small';
 
 		return (
diff --git a/src/components/SearchableSelect/SearchableSelect.jsx b/src/components/SearchableSelect/SearchableSelect.jsx
index cdefea2ee..d662ff01c 100644
--- a/src/components/SearchableSelect/SearchableSelect.jsx
+++ b/src/components/SearchableSelect/SearchableSelect.jsx
@@ -353,7 +353,7 @@ const SearchableSelect = createClass({
 		const { flattenedOptionsData } = this.state;
 
 		const searchFieldProps = _.get(
-			getFirst(props, SearchField, <SearchField />),
+			getFirst(props, SearchField) || <SearchField />,
 			'props'
 		);
 		const placeholderProps = _.first(