diff --git a/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp b/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp
index 8053f78283..35166e1ca3 100644
--- a/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp
+++ b/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp
@@ -1,109 +1,119 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkUSTelemedImageSource.h"
 #include "mitkUSTelemedSDKHeader.h"
 #include "MITKUSTelemedScanConverterPlugin.h"
 #include "mitkImageReadAccessor.h"
 
 mitk::USTelemedImageSource::USTelemedImageSource(  )
   : m_Image(mitk::Image::New()),
     m_ImageMutex(itk::FastMutexLock::New()),
     m_Plugin(0),
-    m_PluginCallback(0)
+    m_PluginCallback(0),
+    m_UsgDataView(0),
+    m_ImageProperties(0),
+    m_DepthProperties(0),
+    m_upDateCounter(0)
 {
 }
 
 mitk::USTelemedImageSource::~USTelemedImageSource( )
 {
   SAFE_RELEASE(m_PluginCallback);
   SAFE_RELEASE(m_Plugin);
   SAFE_RELEASE(m_ImageProperties);
   SAFE_RELEASE(m_DepthProperties);
 }
 
 void mitk::USTelemedImageSource::GetNextRawImage( mitk::Image::Pointer& image)
 {
   if ( image.IsNull() ) { image = mitk::Image::New(); }
   if ( m_Image->IsInitialized() )
   {
     m_ImageMutex->Lock();
 
     // copy contents of the given image into the member variable
     image->Initialize(m_Image->GetPixelType(), m_Image->GetDimension(), m_Image->GetDimensions());
     mitk::ImageReadAccessor inputReadAccessor(m_Image, m_Image->GetSliceData(0,0,0));
     image->SetSlice(inputReadAccessor.GetData());
 
     m_ImageMutex->Unlock();
   }
-  //if depth changed: update geometry
-  if (m_OldDepth != m_DepthProperties->GetCurrent()) {UpdateImageGeometry();}
+  //if depth changed: update geometry, but 15 frames after the change because it takes this time until geometry adapts
+  if (m_OldDepth != m_DepthProperties->Current)
+    {
+    m_upDateCounter=0;
+    m_OldDepth =  m_DepthProperties->GetCurrent();
+    }
+  if (m_upDateCounter==15) {UpdateImageGeometry();}
+  if (m_upDateCounter<=15) m_upDateCounter++;
 }
 
 void mitk::USTelemedImageSource::UpdateImageGeometry()
 {
+  MITK_INFO << "UpdateImageGeometry called!";
+
   Usgfw2Lib::tagImageResolution currentResolution;
   m_ImageProperties->GetResolution(&currentResolution,0);
-  m_OldDepth =  m_DepthProperties->GetCurrent();
 
-  MITK_INFO << "UpdateImageGeometry called!";
   MITK_INFO << "depth: " << m_DepthProperties->GetCurrent();
   MITK_INFO << "res X: " << currentResolution.nXPelsPerUnit;
   MITK_INFO << "res Y: " << currentResolution.nYPelsPerUnit;
 
 }
 
 bool mitk::USTelemedImageSource::CreateAndConnectConverterPlugin(Usgfw2Lib::IUsgDataView* usgDataView, Usgfw2Lib::tagScanMode scanMode)
 {
   IUnknown* tmp_obj = NULL;
 
   // create control object from Telemed API
   mitk::telemed::CreateUsgControl( usgDataView, Usgfw2Lib::IID_IUsgScanConverterPlugin, scanMode, 0, (void**)&tmp_obj );
   if ( ! tmp_obj )
   {
     MITK_ERROR("USImageSource")("USTelemedImageSource") << "Could not create scan converter plugin.";
     return false;
   }
 
   // create the callback object for the scan conversion
   if ( ! m_PluginCallback )
   {
     m_PluginCallback = new USTelemedScanConverterPlugin();
 
     // current image buffer should be copied to m_Image at every callback
     m_PluginCallback->SetOutputImage(m_Image.GetPointer(), m_ImageMutex);
   }
   else
   {
     // make sure that the scan converter plugin is not set
     // to the plugin callback any longer
     m_PluginCallback->SetScanConverterPlugin(0);
   }
 
   // now the ScanConverterPlugin can be created and set as plugin
   SAFE_RELEASE(m_Plugin);
   m_Plugin = (Usgfw2Lib::IUsgScanConverterPlugin*)tmp_obj;
   m_PluginCallback->SetScanConverterPlugin(m_Plugin);
 
   //last: create some connections which are needed inside this class for communication with the telemed device
   m_UsgDataView = usgDataView;
 
   // create telemed controls
   if (!m_DepthProperties) {CREATE_TelemedControl(m_DepthProperties, m_UsgDataView, Usgfw2Lib::IID_IUsgDepth, Usgfw2Lib::IUsgDepth, Usgfw2Lib::SCAN_MODE_B);}
   if (!m_ImageProperties) {CREATE_TelemedControl(m_ImageProperties, m_UsgDataView, Usgfw2Lib::IID_IUsgImageProperties, Usgfw2Lib::IUsgImageProperties, Usgfw2Lib::SCAN_MODE_B);}
 
   return true;
 }
\ No newline at end of file
diff --git a/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h b/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h
index 80d3e33a6e..2961df65d0 100644
--- a/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h
+++ b/Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h
@@ -1,81 +1,83 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKUSTelemedImageSource_H_HEADER_INCLUDED_
 #define MITKUSTelemedImageSource_H_HEADER_INCLUDED_
 
 #include "mitkUSImageSource.h"
 #include "mitkUSTelemedSDKHeader.h"
 #include "mitkUSTelemedScanConverterPlugin.h"
 
 #include "itkFastMutexLock.h"
 
 namespace mitk {
 /**
   * \brief Implementation of mitk::USImageSource for Telemed API devices.
   * The method mitk::USImageSource::GetNextRawImage() is implemented for
   * getting images from the Telemed API.
   *
   * A method for connecting this ImageSource to the Telemed API is
   * implemented (mitk::USTelemedImageSource::CreateAndConnectConverterPlugin()).
   * This method is available for being used by mitk::USTelemedDevice.
   */
 class USTelemedImageSource : public USImageSource
 {
 public:
   mitkClassMacro(USTelemedImageSource, USImageSource);
   itkFactorylessNewMacro(Self)
   itkCloneMacro(Self)
 
   /**
     * Implementation of the superclass method. Returns the pointer
     * to the mitk::Image filled by Telemed API callback.
     */
   virtual void GetNextRawImage( mitk::Image::Pointer& );
 
   /**
     * Updates the geometry of the current image from the API.
     * Is used internally when a new image is initialized, but
     * also needs to be called if, e.g., the zoom factor is changed.
     */
   void UpdateImageGeometry();
 
   /**
     * \brief Connect this object to the Telemed API.
     * This method is for being used by mitk::USTelemedDevice.
     */
   bool CreateAndConnectConverterPlugin( Usgfw2Lib::IUsgDataView*, Usgfw2Lib::tagScanMode );
 
 protected:
   USTelemedImageSource( );
   virtual ~USTelemedImageSource( );
 
   Usgfw2Lib::IUsgScanConverterPlugin*         m_Plugin;
   USTelemedScanConverterPlugin*               m_PluginCallback;
 
   Usgfw2Lib::IUsgDataView* m_UsgDataView;  // main SDK object for comminucating with the Telemed API
 
   //API objects for communication, used to get the right geometry
   Usgfw2Lib::IUsgImageProperties* m_ImageProperties;
   Usgfw2Lib::IUsgDepth* m_DepthProperties;
   double m_OldDepth;
+  int m_upDateCounter;
+
 
   mitk::Image::Pointer                        m_Image;
   itk::FastMutexLock::Pointer                 m_ImageMutex;
 };
 } // namespace mitk
 
 #endif // MITKUSTelemedImageSource_H