diff --git a/src/bos/server/controllers/v2/components.py b/src/bos/server/controllers/v2/components.py
index 351145ce..26121cdf 100644
--- a/src/bos/server/controllers/v2/components.py
+++ b/src/bos/server/controllers/v2/components.py
@@ -116,12 +116,11 @@ def get_v2_components_data(id_list=None,
                                          session=session or None,
                                          staged_session=staged_session or None,
                                          phase=phase or None,
-                                         status=status or None)
-    elif delete_timestamp:
-        _component_filter_func = partial(_set_status,
+                                         status=status or None,
                                          delete_timestamp=delete_timestamp)
     else:
-        _component_filter_func = _set_status
+        _component_filter_func = partial(_set_status,
+                                         delete_timestamp=delete_timestamp)
 
     return DB.get_all_filtered(filter_func=_component_filter_func)