diff --git a/DRAMSys/traceAnalyzer/mainwindow.cpp b/DRAMSys/traceAnalyzer/mainwindow.cpp
index 8b68f2c3..2b0ba7bd 100644
--- a/DRAMSys/traceAnalyzer/mainwindow.cpp
+++ b/DRAMSys/traceAnalyzer/mainwindow.cpp
@@ -57,7 +57,6 @@ MainWindow::MainWindow(QWidget *parent) :
                  traceNavigator->GeneralTraceInfo().TraceSpan());
     transactions = db->getTransactionsInTimespan(
                        traceNavigator->GeneralTraceInfo().TraceSpan());
-    db->updateDependenciesInTimespan(traceNavigator->GeneralTraceInfo().TraceSpan());
 
     ui->qwtPlot->setAxisScale(QwtPlot::xBottom,
                               traceNavigator->GeneralTraceInfo().TraceSpan().Begin(),
diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp
index 9123b5a9..573c766b 100644
--- a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp
+++ b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp
@@ -508,7 +508,10 @@ void TracePlot::currentTraceTimeChanged()
 {
     transactions = navigator->TraceFile().getTransactionsInTimespan(
                        GetCurrentTimespan());
-    navigator->TraceFile().updateDependenciesInTimespan(GetCurrentTimespan());
+    if (getDrawingProperties().drawDependenciesOption.draw != DependencyOption::Disabled) {
+        navigator->TraceFile().updateDependenciesInTimespan(GetCurrentTimespan());
+
+    }
 
     setAxisScale(xBottom, GetCurrentTimespan().Begin(), GetCurrentTimespan().End());
     replot();
diff --git a/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp b/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp
index 4220a9d5..d82d3514 100644
--- a/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp
+++ b/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp
@@ -197,7 +197,11 @@ void TraceScroller::currentTraceTimeChanged()
     canvasClip->setInterval(spanOnTracePlot.Begin(), spanOnTracePlot.End());
     Timespan span = GetCurrentTimespan();
     transactions = navigator->TraceFile().getTransactionsInTimespan(span);
-    navigator->TraceFile().updateDependenciesInTimespan(span);
+
+    if (drawingProperties.drawDependenciesOption.draw != DependencyOption::Disabled) {
+        navigator->TraceFile().updateDependenciesInTimespan(span);
+
+    }
 
     setAxisScale(xBottom, span.Begin(), span.End());
     replot();