diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart
index 73476b168a..92561061d2 100644
--- a/packages/flutter_tools/lib/src/commands/analyze.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -102,8 +102,8 @@ class AnalyzeCommand extends FlutterCommand {
       }
     }
 
-    bool currentDirectory = argResults['current-directory'] && dartFiles.isEmpty;
-    bool currentPackage = argResults['current-package'] && dartFiles.isEmpty;
+    bool currentDirectory = argResults['current-directory'] && (argResults.wasParsed('current-directory') || dartFiles.isEmpty);
+    bool currentPackage = argResults['current-package'] && (argResults.wasParsed('current-package') || dartFiles.isEmpty);
     bool flutterRepo = argResults['flutter-repo'];
 
     //TODO (pq): revisit package and directory defaults