diff --git a/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs b/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs
index 264b83760d..5c68cf80bf 100644
--- a/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs
+++ b/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs
@@ -1,10 +1,11 @@
+using System.IO;
 namespace GitVersion
 {
     public class GitHubFlowVersionFinder
     {
         public SemanticVersion FindVersion(GitVersionContext context)
         {
-            var repositoryDirectory = context.Repository.Info.WorkingDirectory;
+            var repositoryDirectory = context.Repository.Info.WorkingDirectory ?? new DirectoryInfo(context.Repository.Info.Path).Parent.Parent.FullName;            
             var lastTaggedReleaseFinder = new LastTaggedReleaseFinder(context);
             var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repositoryDirectory, context.Configuration);
             var nextSemverCalculator = new NextSemverCalculator(nextVersionTxtFileFinder, lastTaggedReleaseFinder, context);