diff --git a/editor/js/Viewport.js b/editor/js/Viewport.js
index 5b2531994b967a373ff41c6197580311fa793f1a..c0c6ae6eac754e6a2758bf531d4638e3816412f1 100644
--- a/editor/js/Viewport.js
+++ b/editor/js/Viewport.js
@@ -410,6 +410,10 @@ var Viewport = function ( editor ) {
 	} );
 
 	signals.objectRemoved.add( function ( object ) {
+		
+		if(object === transformControls.object){
+			transformControls.detach();
+		}
 
 		object.traverse( function ( child ) {