diff --git a/src/grasping/grasp_service.cpp b/src/grasping/grasp_service.cpp
index 5da6b4a8c711ba5941b3877b897ed4ccf8b621a4..e5bbcc6099307e922d3571ae93a958b6a53aeb0c 100644
--- a/src/grasping/grasp_service.cpp
+++ b/src/grasping/grasp_service.cpp
@@ -40,8 +40,6 @@ bool pickObject(panda_grasping::PickObject::Request &req,
 
     if (!grasping_state::object_picked) {
 
-        grasping_state::object_picked = true;
-
         EnvironmentUtil env_util;
         GraspUtil grasp_util;
 
@@ -79,6 +77,7 @@ bool pickObject(panda_grasping::PickObject::Request &req,
             return false;
         }
 
+        grasping_state::object_picked = true;
         res.success = true;
         return true;
     }