diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp
index 508009317..c9483f37c 100644
--- a/src/Mod/Part/App/PartFeature.cpp
+++ b/src/Mod/Part/App/PartFeature.cpp
@@ -103,9 +103,12 @@ void Feature::onChanged(const App::Property* prop)
         }
         else {
             Base::Placement p;
-            p.fromMatrix(this->Shape.getShape().getTransform());
-            if (p != this->Placement.getValue())
-                this->Placement.setValue(p);
+            // shape must not be null to override the placement
+            if (!this->Shape.getValue().IsNull()) {
+                p.fromMatrix(this->Shape.getShape().getTransform());
+                if (p != this->Placement.getValue())
+                    this->Placement.setValue(p);
+            }
         }
     }