diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp
index e4d36b0d..7f09ed5e 100644
--- a/src/script/scriptfunc.cpp
+++ b/src/script/scriptfunc.cpp
@@ -734,6 +734,9 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo
     }
     else
     {
+        CScript* script = static_cast<CScript*>(user);
+        bool deleteSelf = (obj == script->m_object);
+
         if ( exploType != DestructionType::NoEffect && obj->Implements(ObjectInterfaceType::Destroyable) )
         {
             dynamic_cast<CDestroyableObject*>(obj)->DestroyObject(static_cast<DestructionType>(exploType));
@@ -752,12 +755,13 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo
             }
             CObjectManager::GetInstancePointer()->DeleteObject(obj);
         }
+        // Returning "false" here makes sure the program doesn't try to keep executing
+        // if the robot just destroyed itself using delete(this.id)
+        // See issue #925
+        return !deleteSelf;
     }
 
-    // Returning "false" here makes sure the program doesn't try to keep executing if the robot just destroyed itself
-    // using delete(this.id)
-    // See issue #925
-    return false;
+    return true;
 }
 
 static CBotTypResult compileSearch(CBotVar* &var, void* user, CBotTypResult returnValue)