diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index ea58a0f1..80ff7396 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -154,21 +154,19 @@ class order extends Component {
     this.state.select_params[`${id}`] = option_id;
     this.state.select_params.page = 1;
     this.state[`${id}s`] = name;
-    if(current_user){
-      if(this.state.select_params.author_id && (parseInt(this.state.select_params.author_id) === current_user.user_id)){
+    if (current_user) {
+      if ( this.state.select_params.author_id && parseInt(this.state.select_params.author_id) === current_user.user_id) {
         this.state.author_id = current_user.user_id;
-      }else if(this.state.select_params.assigned_to_id && (parseInt(this.state.select_params.assigned_to_id) === current_user.user_id)){
+      } else {
+        this.state.author_id = undefined;
+      }
+
+      if (this.state.select_params.assigned_to_id && parseInt(this.state.select_params.assigned_to_id) === current_user.user_id ) {
         this.state.assigned_to_id = current_user.user_id;
-      }else{
-        this.setState({
-          author_id: undefined,
-          assigned_to_id: undefined
-        });
+      } else {
+        this.state.assigned_to_id = undefined;
       }
     }
-    console.log("author_id", this.state.author_id)
-    console.log("assigned_to_id", this.state.assigned_to_id)
-
     this.getIssueList();
   };