diff --git a/src/main/java/org/onosproject/t3/api/StaticPacketTrace.java b/src/main/java/org/onosproject/t3/api/StaticPacketTrace.java
index cfc6371..e56035d 100644
--- a/src/main/java/org/onosproject/t3/api/StaticPacketTrace.java
+++ b/src/main/java/org/onosproject/t3/api/StaticPacketTrace.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.t3.api;
 
+import com.google.common.collect.ImmutableList;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.flow.FlowEntry;
@@ -151,7 +152,7 @@
      * @return the flows matched
      */
     public List<FlowEntry> getFlowsForDevice(DeviceId deviceId) {
-        return flowsForDevice.get(deviceId);
+        return flowsForDevice.getOrDefault(deviceId, ImmutableList.of());
     }
 
     @Override