diff --git a/common/changes/office-ui-fabric-react/keyou-fix-combobox-scrolling-to-end_2018-03-23-19-17.json b/common/changes/office-ui-fabric-react/keyou-fix-combobox-scrolling-to-end_2018-03-23-19-17.json
new file mode 100644
index 00000000000000..a91ada3c211a82
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/keyou-fix-combobox-scrolling-to-end_2018-03-23-19-17.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Fix bug in combo box where _selectedElement ref wasn't being set conditionally",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "keyou@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx
index 61e21df8e95b95..dd81a87452fa4c 100644
--- a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx
+++ b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx
@@ -1042,7 +1042,7 @@ export class ComboBox extends BaseComponent<IComboBoxProps, IComboBoxState> {
           aria-selected={ isSelected ? 'true' : 'false'}
           ariaLabel= {item.text }
           disabled={ item.disabled }
-        > { <span ref={ this._selectedElement }>
+        > { <span ref={ isSelected ? this._selectedElement : undefined }>
           { onRenderOption(item, this._onRenderOptionContent) }
         </span>
           }