diff --git a/apps/develop/views.py b/apps/develop/views.py
index ae06cbbe..e736d1fd 100755
--- a/apps/develop/views.py
+++ b/apps/develop/views.py
@@ -276,10 +276,10 @@ class TestViewSet(CustomGenericViewSet):
         """
         code = request.data['code']
         codes = request.data['codes']
-        opl_id = request.data['opl']
+        opl_id = request.data.get('opl', None)
         vc = TDevice.objects.get(code=code)
-        snap_and_analyse(vc, codes,
-                         Opl.objects.get(id=opl_id))
+        opl = Opl.objects.get(id=opl_id) if opl_id else None
+        snap_and_analyse(vc, codes, opl)
         return Response()
 
     @action(methods=['post'], detail=False, serializer_class=Serializer)