diff --git a/src/SuplaBundle/Entity/IODevice.php b/src/SuplaBundle/Entity/IODevice.php
index 9ac4e8a72..8729fa796 100644
--- a/src/SuplaBundle/Entity/IODevice.php
+++ b/src/SuplaBundle/Entity/IODevice.php
@@ -153,14 +153,6 @@ public function getLocation() {
     }
 
     public function setLocation(Location $location) {
-        if ($this->originalLocation != null
-            && $this->originalLocation->getId() == $location->getId()
-        ) {
-            $this->originalLocation = null;
-        } elseif ($this->originalLocation == null) {
-            $this->originalLocation = $this->location;
-        }
-
         $this->location = $location;
     }
 
diff --git a/src/SuplaBundle/Resources/views/IODevice/iodevice.html.twig b/src/SuplaBundle/Resources/views/IODevice/iodevice.html.twig
index 42bf10804..059fbbec8 100755
--- a/src/SuplaBundle/Resources/views/IODevice/iodevice.html.twig
+++ b/src/SuplaBundle/Resources/views/IODevice/iodevice.html.twig
@@ -37,7 +37,7 @@
 			<div class="location">
 				<h3>{% trans %}Location{% endtrans %}</h3>
 						
-				{% if iodevice.originalLocation %}
+				{% if (iodevice.originalLocation) and (iodevice.originalLocation != iodevice.location) %}
 				
 				<div class="location-info original">
 					<a href="{{ path('_loc_item', {'id': iodevice.originalLocation.id}) }}" class="item nav-link original">